tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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()

Linus Torvalds 20ebb345 03c751a5

+5 -5
+1 -1
fs/ceph/addr.c
··· 1416 1416 } 1417 1417 } 1418 1418 1419 - dout("fill_inline_data %p %llx.%llx len %lu locked_page %p\n", 1419 + dout("fill_inline_data %p %llx.%llx len %zu locked_page %p\n", 1420 1420 inode, ceph_vinop(inode), len, locked_page); 1421 1421 1422 1422 if (len > 0) {
+2 -2
include/linux/ceph/osd_client.h
··· 87 87 struct ceph_osd_data osd_data; 88 88 } extent; 89 89 struct { 90 - __le32 name_len; 91 - __le32 value_len; 90 + u32 name_len; 91 + u32 value_len; 92 92 __u8 cmp_op; /* CEPH_OSD_CMPXATTR_OP_* */ 93 93 __u8 cmp_mode; /* CEPH_OSD_CMPXATTR_MODE_* */ 94 94 struct ceph_osd_data osd_data;
+1 -1
net/ceph/auth_x.c
··· 676 676 int ret; 677 677 char tmp_enc[40]; 678 678 __le32 tmp[5] = { 679 - 16u, msg->hdr.crc, msg->footer.front_crc, 679 + cpu_to_le32(16), msg->hdr.crc, msg->footer.front_crc, 680 680 msg->footer.middle_crc, msg->footer.data_crc, 681 681 }; 682 682 ret = ceph_x_encrypt(&au->session_key, &tmp, sizeof(tmp),
+1 -1
net/ceph/mon_client.c
··· 717 717 if (src_len != sizeof(u32) + dst_len) 718 718 return -EINVAL; 719 719 720 - buf_len = le32_to_cpu(*(u32 *)src); 720 + buf_len = le32_to_cpu(*(__le32 *)src); 721 721 if (buf_len != dst_len) 722 722 return -EINVAL; 723 723