Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cbf6f12 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

rbd: update feature bits 



There is a new rbd feature bit defined for "fancy striping." Add
it to the ones defined in the kernel client.

Change RBD_FEATURES_ALL so it represents the set of all feature
bits (rather than just the ones we support).  Define a new symbol
RBD_FEATURES_SUPPORTED to indicate the supported ones.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 04017e29

drivers/block/rbd.c

+6 −3
Original line number Diff line number Diff line
@@ -73,11 +73,14 @@ 


/* Feature bits */



#define RBD_FEATURE_LAYERING      1

#define RBD_FEATURE_LAYERING	(1<<0)

#define RBD_FEATURE_STRIPINGV2	(1<<1)

#define RBD_FEATURES_ALL \

	    (RBD_FEATURE_LAYERING | RBD_FEATURE_STRIPINGV2)



/* Features supported by this (client software) implementation. */



#define RBD_FEATURES_ALL          (0)

#define RBD_FEATURES_SUPPORTED	(0)



/*

 * An RBD device name will be "rbd#", where the "rbd" comes from
@@ -2843,7 +2846,7 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id, 
		return ret;



	incompat = le64_to_cpu(features_buf.incompat);

	if (incompat & ~RBD_FEATURES_ALL)

	if (incompat & ~RBD_FEATURES_SUPPORTED)

		return -ENXIO;



	*snap_features = le64_to_cpu(features_buf.features);