X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Ffuse%2Ffile.c;h=f28cf8b46f806f89c595de8f746731032e625d0d;hb=1df5a8d004f64b1aa3fb93e0556886ba00ebc979;hp=9ced35b006867e1445af3f9fe010906ac0684f87;hpb=95dfec6ae1cb8c03406aac612a5642cbddb676b3;p=linux-2.6

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 9ced35b006..f28cf8b46f 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -934,7 +934,7 @@ static int fuse_get_user_pages(struct fuse_req *req, const char __user *buf,
 
 	nbytes = min(nbytes, (unsigned) FUSE_MAX_PAGES_PER_REQ << PAGE_SHIFT);
 	npages = (nbytes + offset + PAGE_SIZE - 1) >> PAGE_SHIFT;
-	npages = min(max(npages, 1), FUSE_MAX_PAGES_PER_REQ);
+	npages = clamp(npages, 1, FUSE_MAX_PAGES_PER_REQ);
 	down_read(&current->mm->mmap_sem);
 	npages = get_user_pages(current, current->mm, user_addr, npages, write,
 				0, req->pages, NULL);