Commit 125d725c authored Jan 28, 2014 by Ilya Dryomov Committed by Sage Weil Jan 28, 2014

ceph: cast PAGE_SIZE to size_t in ceph_sync_write()



Use min_t(size_t, ...) instead of plain min(), which does strict type
checking, to avoid compile warning on i386.

Cc: Jianpeng Ma <majianpeng@gmail.com>
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

parent 37b52fe6

fs/ceph/file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -734,7 +734,7 @@ static ssize_t ceph_sync_write(struct kiocb iocb, const struct iovec iov,

		left = len;
		for (n = 0; n < num_pages; n++) {
		size_t plen = min(left, PAGE_SIZE);
		size_t plen = min_t(size_t, left, PAGE_SIZE);
		ret = iov_iter_copy_from_user(pages[n], &i, 0, plen);
		if (ret != plen) {
		ret = -EFAULT;