lkml.org 
[lkml]   [2016]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 071/138] nfs: fix nfs_size_to_loff_t
    Date
    3.13.11-ckt36 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Christoph Hellwig <hch@lst.de>

    commit 50ab8ec74a153eb30db26529088bc57dd700b24c upstream.

    See http: //www.infradead.org/rpr.html
    X-Evolution-Source: 1451162204.2173.11@leira.trondhjem.org
    Content-Transfer-Encoding: 8bit
    Mime-Version: 1.0

    We support OFFSET_MAX just fine, so don't round down below it. Also
    switch to using min_t to make the helper more readable.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Fixes: 433c92379d9c ("NFS: Clean up nfs_size_to_loff_t()")
    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    include/linux/nfs_fs.h | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
    index 4899737..d3c0bbe 100644
    --- a/include/linux/nfs_fs.h
    +++ b/include/linux/nfs_fs.h
    @@ -589,9 +589,7 @@ static inline void nfs3_forget_cached_acls(struct inode *inode)

    static inline loff_t nfs_size_to_loff_t(__u64 size)
    {
    - if (size > (__u64) OFFSET_MAX - 1)
    - return OFFSET_MAX - 1;
    - return (loff_t) size;
    + return min_t(u64, size, OFFSET_MAX);
    }

    static inline ino_t
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-10 01:01    [W:4.412 / U:0.664 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site