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

Commit 8e94af8e authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

rbd: encapsulate header validity test 



If an rbd image header is read and it doesn't begin with the
expected magic information, a warning is displayed.  This is
a fairly simple test, but it could be extended at some point.
Fix the comparison so it actually looks at the "text" field
rather than the front of the structure.

In any case, encapsulate the validity test in its own function.

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

drivers/block/rbd.c

+7 −1
Original line number Diff line number Diff line
@@ -481,6 +481,12 @@ static void rbd_coll_release(struct kref *kref) 
	kfree(coll);

}



static bool rbd_dev_ondisk_valid(struct rbd_image_header_ondisk *ondisk)

{

	return !memcmp(&ondisk->text,

			RBD_HEADER_TEXT, sizeof (RBD_HEADER_TEXT));

}



/*

 * Create a new header structure, translate header format from the on-disk

 * header.
@@ -492,7 +498,7 @@ static int rbd_header_from_disk(struct rbd_image_header *header, 
{

	u32 i, snap_count;



	if (memcmp(ondisk, RBD_HEADER_TEXT, sizeof(RBD_HEADER_TEXT)))

	if (!rbd_dev_ondisk_valid(ondisk))

		return -ENXIO;



	snap_count = le32_to_cpu(ondisk->snap_count);