diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-05-01 13:35:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 17:04:02 +0200 |
| commit | bd7309677c937bf23296f6c81027123c84c5cc5c (patch) | |
| tree | b5dfaf691425424c5f4a1ed23c1e019a111808fa /fs/fuse | |
| parent | cciss: assign PDE->data before gluing PDE into /proc tree (diff) | |
| download | linux-bd7309677c937bf23296f6c81027123c84c5cc5c.tar.xz linux-bd7309677c937bf23296f6c81027123c84c5cc5c.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | fs/fuse/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 9ced35b00686..f28cf8b46f80 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(¤t->mm->mmap_sem); npages = get_user_pages(current, current->mm, user_addr, npages, write, 0, req->pages, NULL); |