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

Commit 24dca799 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

rbd: kill rbd_image_header::{crypt_type,comp_type} 



Image format 1 is deprecated and format 2 doesn't have these.  Also,
__rbd_dev_create() takes care of zeroing (or otherwise initializing)
format 2 specific fields.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarJason Dillaman <dillaman@redhat.com>
parent 848d796c

drivers/block/rbd.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -144,8 +144,6 @@ struct rbd_image_header { 
	/* These six fields never change for a given rbd image */

	/* These six fields never change for a given rbd image */

	char *object_prefix;

	char *object_prefix;

	__u8 obj_order;

	__u8 obj_order;

	__u8 crypt_type;

	__u8 comp_type;

	u64 stripe_unit;

	u64 stripe_unit;

	u64 stripe_count;

	u64 stripe_count;

	u64 features;		/* Might be changeable someday? */

	u64 features;		/* Might be changeable someday? */
@@ -1047,12 +1045,6 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev, 
	if (first_time) {

	if (first_time) {

		header->object_prefix = object_prefix;

		header->object_prefix = object_prefix;

		header->obj_order = ondisk->options.order;

		header->obj_order = ondisk->options.order;

		header->crypt_type = ondisk->options.crypt_type;

		header->comp_type = ondisk->options.comp_type;

		/* The rest aren't used for format 1 images */

		header->stripe_unit = 0;

		header->stripe_count = 0;

		header->features = 0;

	} else {

	} else {

		ceph_put_snap_context(header->snapc);

		ceph_put_snap_context(header->snapc);

		kfree(header->snap_names);

		kfree(header->snap_names);
@@ -5938,7 +5930,6 @@ static int rbd_dev_v2_header_onetime(struct rbd_device *rbd_dev) 
		if (ret < 0)

		if (ret < 0)

			goto out_err;

			goto out_err;

	}

	}

	/* No support for crypto and compression type format 2 images */





	return 0;

	return 0;

out_err:

out_err:

drivers/block/rbd_types.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -57,9 +57,6 @@ enum rbd_notify_op { 
#define RBD_MIN_OBJ_ORDER       16

#define RBD_MIN_OBJ_ORDER       16

#define RBD_MAX_OBJ_ORDER       30

#define RBD_MAX_OBJ_ORDER       30





#define RBD_COMP_NONE		0

#define RBD_CRYPT_NONE		0



#define RBD_HEADER_TEXT		"<<< Rados Block Device Image >>>\n"

#define RBD_HEADER_TEXT		"<<< Rados Block Device Image >>>\n"

#define RBD_HEADER_SIGNATURE	"RBD"

#define RBD_HEADER_SIGNATURE	"RBD"

#define RBD_HEADER_VERSION	"001.005"

#define RBD_HEADER_VERSION	"001.005"