UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ilya Dryomov 2014-01-28 19:16:18 +02:00 committed by Sage Weil
parent 37b52fe608
commit 125d725c92
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ceph/file.c
View File

@ -734,7 +734,7 @@ static ssize_t ceph_sync_write(struct kiocb *iocb, const struct iovec *iov,
left = len; left = len;
for (n = 0; n < num_pages; n++) { 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); ret = iov_iter_copy_from_user(pages[n], &i, 0, plen);
if (ret != plen) { if (ret != plen) {
ret = -EFAULT; ret = -EFAULT;