path: root/fs
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-09 17:55:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-09 17:55:00 -0800
commit20ebb345282d9d90603b021ced113b73e9cdb6a1 (patch)
tree15acd873285f03fe75971e8641905bc51cecb2a5 /fs
parent03c751a5e10caafbb6d1afcaf1ea67f2153c3193 (diff)
parentd7d5a007b1c64c617ce3ee30c973ed0bb93443d9 (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 'fs')
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index f5013d92a7e6..c81c0e004588 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -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) {

Privacy Policy