From c650e558d634d6493ec5a6681aa9349d64ba8fac Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 19 Apr 2013 14:20:07 -0700 Subject: [PATCH] --- yaml --- r: 373461 b: refs/heads/master c: ac7f29bf2ee4a526efb68f947475ff77a43028de h: refs/heads/master i: 373459: 5802ae45f90104d573cc592720a46a482a352b0e v: v3 --- [refs] | 2 +- trunk/fs/ceph/file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c1efc2df0522..77363faf2155 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ac0fc8adfc725660ee53a953b06855f64f8e792 +refs/heads/master: ac7f29bf2ee4a526efb68f947475ff77a43028de diff --git a/trunk/fs/ceph/file.c b/trunk/fs/ceph/file.c index c639d9279fdd..7e94dcb66d92 100644 --- a/trunk/fs/ceph/file.c +++ b/trunk/fs/ceph/file.c @@ -747,7 +747,7 @@ static ssize_t ceph_aio_write(struct kiocb *iocb, const struct iovec *iov, goto out; } - dout("aio_write %p %llx.%llx %llu~%ld getting caps. i_size %llu\n", + dout("aio_write %p %llx.%llx %llu~%zd getting caps. i_size %llu\n", inode, ceph_vinop(inode), pos, count, inode->i_size); if (fi->fmode & CEPH_FILE_MODE_LAZY) want = CEPH_CAP_FILE_BUFFER | CEPH_CAP_FILE_LAZYIO; @@ -758,7 +758,7 @@ static ssize_t ceph_aio_write(struct kiocb *iocb, const struct iovec *iov, if (err < 0) goto out; - dout("aio_write %p %llx.%llx %llu~%ld got cap refs on %s\n", + dout("aio_write %p %llx.%llx %llu~%zd got cap refs on %s\n", inode, ceph_vinop(inode), pos, count, ceph_cap_string(got)); if ((got & (CEPH_CAP_FILE_BUFFER|CEPH_CAP_FILE_LAZYIO)) == 0 ||