diff options
author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-01-28 11:29:29 -0500 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2014-01-28 12:57:06 -0500 |
commit | 37b52fe60838b135913e877b0c849e59fae587c3 (patch) | |
tree | 8b8c3615c25acb34349ef3fd7823d4cec5a2f231 /fs/ceph/addr.c | |
parent | 80e163a58c0c69ef1a0ba3500d9932b14d67bf64 (diff) |
ceph: fix dout() compile warnings in ceph_filemap_fault()
PAGE_CACHE_SIZE is unsigned long on all architectures, however size_t
is either unsigned int or unsigned long. Rather than change format
strings, cast PAGE_CACHE_SIZE to size_t to be in line with dout()s in
ceph_page_mkwrite().
Cc: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs/ceph/addr.c')
-rw-r--r-- | fs/ceph/addr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 791a9a23fc60..b53278c9fd97 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c | |||
@@ -1220,7 +1220,7 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
1220 | int want, got, ret; | 1220 | int want, got, ret; |
1221 | 1221 | ||
1222 | dout("filemap_fault %p %llx.%llx %llu~%zd trying to get caps\n", | 1222 | dout("filemap_fault %p %llx.%llx %llu~%zd trying to get caps\n", |
1223 | inode, ceph_vinop(inode), off, PAGE_CACHE_SIZE); | 1223 | inode, ceph_vinop(inode), off, (size_t)PAGE_CACHE_SIZE); |
1224 | if (fi->fmode & CEPH_FILE_MODE_LAZY) | 1224 | if (fi->fmode & CEPH_FILE_MODE_LAZY) |
1225 | want = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO; | 1225 | want = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO; |
1226 | else | 1226 | else |
@@ -1236,12 +1236,12 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
1236 | } | 1236 | } |
1237 | } | 1237 | } |
1238 | dout("filemap_fault %p %llu~%zd got cap refs on %s\n", | 1238 | dout("filemap_fault %p %llu~%zd got cap refs on %s\n", |
1239 | inode, off, PAGE_CACHE_SIZE, ceph_cap_string(got)); | 1239 | inode, off, (size_t)PAGE_CACHE_SIZE, ceph_cap_string(got)); |
1240 | 1240 | ||
1241 | ret = filemap_fault(vma, vmf); | 1241 | ret = filemap_fault(vma, vmf); |
1242 | 1242 | ||
1243 | dout("filemap_fault %p %llu~%zd dropping cap refs on %s ret %d\n", | 1243 | dout("filemap_fault %p %llu~%zd dropping cap refs on %s ret %d\n", |
1244 | inode, off, PAGE_CACHE_SIZE, ceph_cap_string(got), ret); | 1244 | inode, off, (size_t)PAGE_CACHE_SIZE, ceph_cap_string(got), ret); |
1245 | ceph_put_cap_refs(ci, got); | 1245 | ceph_put_cap_refs(ci, got); |
1246 | 1246 | ||
1247 | return ret; | 1247 | return ret; |