diff options
| author | Christoph Hellwig | 2016-02-08 14:11:50 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-03-03 17:06:53 -0600 |
| commit | ebbc1058f6efbd635e6c7c19cba5db1ad3acfcda (patch) | |
| tree | f47464b0c6c19609cdee1fc7fbc4337e675300b3 | |
| parent | 4606a229c2f2b44223faa13b192165ba545ee2a9 (diff) | |
| download | kernel-video-ebbc1058f6efbd635e6c7c19cba5db1ad3acfcda.tar.gz kernel-video-ebbc1058f6efbd635e6c7c19cba5db1ad3acfcda.tar.xz kernel-video-ebbc1058f6efbd635e6c7c19cba5db1ad3acfcda.zip | |
nfs: fix nfs_size_to_loff_t
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | include/linux/nfs_fs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 0ae5807480f..1e122cc9ea3 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
| @@ -580,9 +580,7 @@ static inline int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, | |||
| 580 | 580 | ||
| 581 | static inline loff_t nfs_size_to_loff_t(__u64 size) | 581 | static inline loff_t nfs_size_to_loff_t(__u64 size) |
| 582 | { | 582 | { |
| 583 | if (size > (__u64) OFFSET_MAX - 1) | 583 | return min_t(u64, size, OFFSET_MAX); |
| 584 | return OFFSET_MAX - 1; | ||
| 585 | return (loff_t) size; | ||
| 586 | } | 584 | } |
| 587 | 585 | ||
| 588 | static inline ino_t | 586 | static inline ino_t |