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

Commit bee2d97b 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 two ceph fixes from Sage Weil:
 "The first fixes a leak in the rbd setup error path, and the second
  fixes a more serious problem with mismatched kmap/kunmap that surfaced
  after the recent refactoring work."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  libceph: only kunmap kmapped pages
  rbd: drop dev reference on error in rbd_open()
parents 979570e0 5ce765a5

drivers/block/rbd.c

+3 −4
Original line number Diff line number Diff line
@@ -246,13 +246,12 @@ static int rbd_open(struct block_device *bdev, fmode_t mode) 
{

	struct rbd_device *rbd_dev = bdev->bd_disk->private_data;



	rbd_get_dev(rbd_dev);



	set_device_ro(bdev, rbd_dev->read_only);



	if ((mode & FMODE_WRITE) && rbd_dev->read_only)

		return -EROFS;



	rbd_get_dev(rbd_dev);

	set_device_ro(bdev, rbd_dev->read_only);



	return 0;

}

net/ceph/messenger.c

+1 −4
Original line number Diff line number Diff line
@@ -1073,16 +1073,13 @@ static int write_partial_msg_pages(struct ceph_connection *con) 
			BUG_ON(kaddr == NULL);

			base = kaddr + con->out_msg_pos.page_pos + bio_offset;

			crc = crc32c(crc, base, len);

			kunmap(page);

			msg->footer.data_crc = cpu_to_le32(crc);

			con->out_msg_pos.did_page_crc = true;

		}

		ret = ceph_tcp_sendpage(con->sock, page,

				      con->out_msg_pos.page_pos + bio_offset,

				      len, 1);



		if (do_datacrc)

			kunmap(page);



		if (ret <= 0)

			goto out;