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

Commit 78750f19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client 

Pull Ceph fix from Sage Weil:
 "This fixes another problem with using v2 images on 3.10 due to the
  order in which fields are read from the image header.

  Hopefully this is the last one"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: fetch object order before using it
parents 1e876e3b 1617e40c

drivers/block/rbd.c

+4 −4
Original line number Diff line number Diff line
@@ -4243,6 +4243,10 @@ static int rbd_dev_v2_header_info(struct rbd_device *rbd_dev) 


	down_write(&rbd_dev->header_rwsem);



	ret = rbd_dev_v2_image_size(rbd_dev);

	if (ret)

		goto out;



	if (first_time) {

		ret = rbd_dev_v2_header_onetime(rbd_dev);

		if (ret)
@@ -4276,10 +4280,6 @@ static int rbd_dev_v2_header_info(struct rbd_device *rbd_dev) 
					"is EXPERIMENTAL!");

	}



	ret = rbd_dev_v2_image_size(rbd_dev);

	if (ret)

		goto out;



	if (rbd_dev->spec->snap_id == CEPH_NOSNAP)

		if (rbd_dev->mapping.size != rbd_dev->header.image_size)

			rbd_dev->mapping.size = rbd_dev->header.image_size;