Remove some #defines that are no longer used, and replace some
others with an enum.
And remove an unused field.
Reviewed-by: NDan Williams <dan.j.williams@intel.com>
Signed-off-by: NNeilBrown <neilb@suse.de>