commit bd7309677c937bf23296f6c81027123c84c5cc5c
author Harvey Harrison <harvey.harrison@gmail.com> Thu May 01 04:35:15 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu May 01 08:04:02 2008 -0700
tree b5dfaf691425424c5f4a1ed23c1e019a111808fa
parent 3dfcf9c4bf1fda4aa75861bcf6c50607dd322fe5

fuse: use clamp() rather than nested min/max

clamp() exists for this use.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

fs/fuse/file.c

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 9ced35b..f28cf8b 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -934,7 +934,7 @@
 
 	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);