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

Commit 20ebb345 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:
 "These are both pretty trivial: a sparse warning fix and size_t printk
  thing"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  libceph: fix sparse endianness warnings
  ceph: use %zu for len in ceph_fill_inline_data()
parents 03c751a5 d7d5a007

fs/ceph/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -1416,7 +1416,7 @@ void ceph_fill_inline_data(struct inode *inode, struct page *locked_page, 
		}

	}



	dout("fill_inline_data %p %llx.%llx len %lu locked_page %p\n",

	dout("fill_inline_data %p %llx.%llx len %zu locked_page %p\n",

	     inode, ceph_vinop(inode), len, locked_page);



	if (len > 0) {

include/linux/ceph/osd_client.h

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ struct ceph_osd_req_op { 
			struct ceph_osd_data osd_data;

		} extent;

		struct {

			__le32 name_len;

			__le32 value_len;

			u32 name_len;

			u32 value_len;

			__u8 cmp_op;       /* CEPH_OSD_CMPXATTR_OP_* */

			__u8 cmp_mode;     /* CEPH_OSD_CMPXATTR_MODE_* */

			struct ceph_osd_data osd_data;

net/ceph/auth_x.c

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ static int calcu_signature(struct ceph_x_authorizer *au, 
	int ret;

	char tmp_enc[40];

	__le32 tmp[5] = {

		16u, msg->hdr.crc, msg->footer.front_crc,

		cpu_to_le32(16), msg->hdr.crc, msg->footer.front_crc,

		msg->footer.middle_crc, msg->footer.data_crc,

	};

	ret = ceph_x_encrypt(&au->session_key, &tmp, sizeof(tmp),

net/ceph/mon_client.c

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static int get_poolop_reply_buf(const char *src, size_t src_len, 
	if (src_len != sizeof(u32) + dst_len)

		return -EINVAL;



	buf_len = le32_to_cpu(*(u32 *)src);

	buf_len = le32_to_cpu(*(__le32 *)src);

	if (buf_len != dst_len)

		return -EINVAL;