Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37b52fe6 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Sage Weil
Browse files

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: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent 80e163a5

fs/ceph/addr.c

+3 −3
Original line number Diff line number Diff line
@@ -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;