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

Commit 30625569 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 patch fixes a problem when we have a page count of 0 for
  sendpage which is triggered by zfs.  The second fixes a bug in CRUSH
  that was resolved in the userland code a while back but fell through
  the cracks on the kernel side"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  crush: decode and initialize chooseleaf_vary_r
  libceph: fix corruption when using page_count 0 page in rbd
parents 5e9d9fc4 f140662f

net/ceph/messenger.c

+19 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int ceph_tcp_sendmsg(struct socket *sock, struct kvec *iov, 
	return r;

}



static int ceph_tcp_sendpage(struct socket *sock, struct page *page,

static int __ceph_tcp_sendpage(struct socket *sock, struct page *page,

		     int offset, size_t size, bool more)

{

	int flags = MSG_DONTWAIT | MSG_NOSIGNAL | (more ? MSG_MORE : MSG_EOR);
@@ -570,6 +570,24 @@ static int ceph_tcp_sendpage(struct socket *sock, struct page *page, 
	return ret;

}



static int ceph_tcp_sendpage(struct socket *sock, struct page *page,

		     int offset, size_t size, bool more)

{

	int ret;

	struct kvec iov;



	/* sendpage cannot properly handle pages with page_count == 0,

	 * we need to fallback to sendmsg if that's the case */

	if (page_count(page) >= 1)

		return __ceph_tcp_sendpage(sock, page, offset, size, more);



	iov.iov_base = kmap(page) + offset;

	iov.iov_len = size;

	ret = ceph_tcp_sendmsg(sock, &iov, 1, size, more);

	kunmap(page);



	return ret;

}



/*

 * Shutdown/close the socket for the given connection.

net/ceph/osdmap.c

+5 −0
Original line number Diff line number Diff line
@@ -329,6 +329,11 @@ static struct crush_map *crush_decode(void *pbyval, void *end) 
	dout("crush decode tunable chooseleaf_descend_once = %d",

	     c->chooseleaf_descend_once);



	ceph_decode_need(p, end, sizeof(u8), done);

	c->chooseleaf_vary_r = ceph_decode_8(p);

	dout("crush decode tunable chooseleaf_vary_r = %d",

	     c->chooseleaf_vary_r);



done:

	dout("crush_decode success\n");

	return c;