diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-09 17:55:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-09 17:55:00 -0800 |
| commit | 20ebb345282d9d90603b021ced113b73e9cdb6a1 (patch) | |
| tree | 15acd873285f03fe75971e8641905bc51cecb2a5 /include/linux | |
| parent | 03c751a5e10caafbb6d1afcaf1ea67f2153c3193 (diff) | |
| parent | d7d5a007b1c64c617ce3ee30c973ed0bb93443d9 (diff) | |
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()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ceph/osd_client.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 5d86416d35f..61b19c46bdb 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -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; |