Commit 20ebb345282d9d90603b021ced113b73e9cdb6a1
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
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()
Showing 4 changed files Side-by-side Diff
fs/ceph/addr.c
include/linux/ceph/osd_client.h
| ... | ... | @@ -87,8 +87,8 @@ |
| 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; |
net/ceph/auth_x.c
| ... | ... | @@ -676,7 +676,7 @@ |
| 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), |
net/ceph/mon_client.c