diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-01-28 18:29:29 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2014-01-28 09:57:06 -0800 |
| commit | 37b52fe60838b135913e877b0c849e59fae587c3 (patch) | |
| tree | 8b8c3615c25acb34349ef3fd7823d4cec5a2f231 /fs | |
| parent | 80e163a58c0c69ef1a0ba3500d9932b14d67bf64 (diff) | |
| download | op-kernel-dev-37b52fe60838b135913e877b0c849e59fae587c3.zip op-kernel-dev-37b52fe60838b135913e877b0c849e59fae587c3.tar.gz | |
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')
| -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 791a9a2..b53278c 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) int want, got, ret; dout("filemap_fault %p %llx.%llx %llu~%zd trying to get caps\n", - inode, ceph_vinop(inode), off, PAGE_CACHE_SIZE); + inode, ceph_vinop(inode), off, (size_t)PAGE_CACHE_SIZE); if (fi->fmode & CEPH_FILE_MODE_LAZY) want = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO; else @@ -1236,12 +1236,12 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) } } dout("filemap_fault %p %llu~%zd got cap refs on %s\n", - inode, off, PAGE_CACHE_SIZE, ceph_cap_string(got)); + inode, off, (size_t)PAGE_CACHE_SIZE, ceph_cap_string(got)); ret = filemap_fault(vma, vmf); dout("filemap_fault %p %llu~%zd dropping cap refs on %s ret %d\n", - inode, off, PAGE_CACHE_SIZE, ceph_cap_string(got), ret); + inode, off, (size_t)PAGE_CACHE_SIZE, ceph_cap_string(got), ret); ceph_put_cap_refs(ci, got); return ret; |
