leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Browse Source 
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()
This commit is contained in:
Linus Torvalds 2015-01-09 17:55:00 -08:00
commit 20ebb34528
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ceph/addr.c
View File

@ -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); inode, ceph_vinop(inode), len, locked_page);
if (len > 0) { if (len > 0) {

4
include/linux/ceph/osd_client.h
View File

@ -87,8 +87,8 @@ struct ceph_osd_req_op {
struct ceph_osd_data osd_data; struct ceph_osd_data osd_data;
} extent; } extent;
struct { struct {
__le32 name_len; u32 name_len;
__le32 value_len; u32 value_len;
__u8 cmp_op; /* CEPH_OSD_CMPXATTR_OP_* */ __u8 cmp_op; /* CEPH_OSD_CMPXATTR_OP_* */
__u8 cmp_mode; /* CEPH_OSD_CMPXATTR_MODE_* */ __u8 cmp_mode; /* CEPH_OSD_CMPXATTR_MODE_* */
struct ceph_osd_data osd_data; struct ceph_osd_data osd_data;

2
net/ceph/auth_x.c
View File

@ -676,7 +676,7 @@ static int calcu_signature(struct ceph_x_authorizer *au,
int ret; int ret;
char tmp_enc[40]; char tmp_enc[40];
__le32 tmp[5] = { __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, msg->footer.middle_crc, msg->footer.data_crc,
}; };
ret = ceph_x_encrypt(&au->session_key, &tmp, sizeof(tmp), ret = ceph_x_encrypt(&au->session_key, &tmp, sizeof(tmp),

2
net/ceph/mon_client.c
View File

@ -717,7 +717,7 @@ static int get_poolop_reply_buf(const char *src, size_t src_len,
if (src_len != sizeof(u32) + dst_len) if (src_len != sizeof(u32) + dst_len)
return -EINVAL; return -EINVAL;
buf_len = le32_to_cpu(*(u32 *)src); buf_len = le32_to_cpu(*(__le32 *)src);
if (buf_len != dst_len) if (buf_len != dst_len)
return -EINVAL; return -EINVAL;