diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-01-28 18:16:18 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2014-01-28 18:57:21 +0100 |
| commit | 125d725c923527a85876c031028c7f55c28b74b3 (patch) | |
| tree | ca470b4d6d71254f5becb292d54f223f3c4fc513 | |
| parent | ceph: fix dout() compile warnings in ceph_filemap_fault() (diff) | |
| download | linux-125d725c923527a85876c031028c7f55c28b74b3.tar.xz linux-125d725c923527a85876c031028c7f55c28b74b3.zip | |
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>
| -rw-r--r-- | fs/ceph/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index d10510a4733d..dfd2ce3419f8 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -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; |