lkml.org 
[lkml]   [2008]   [Mar]   [14]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 07/10] fuse: use clamp() rather than nested min/max
    FromHarvey Harrison <>
    DateThu, 13 Mar 2008 22:21:10 -0700
    clamp() exists for this use.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    ---
     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 676b0bc..8c6d51d 100644
    --- a/fs/fuse/file.c
    +++ b/fs/fuse/file.c
    @@ -613,7 +613,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);
    -- 
    1.5.4.4.653.g7cf1e
    
    
    
    
    \
     
     \ /
      Last update: 2008-03-14 06:25    [from the cache]
    ©2003-2008