Skip to contentSkip to conversation

Patch "nfs: fix nfs_size_to_loff_t" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message Mar 1, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

nfs: fix nfs_size_to_loff_t

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
nfs-fix-nfs_size_to_loff_t.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 50ab8ec74a153eb30db26529088bc57dd700b24c Mon Sep 17 00:00:00 2001

From: Christoph Hellwig <[email protected]>
Date: Mon, 8 Feb 2016 21:11:50 +0100
Subject: nfs: fix nfs_size_to_loff_t

From: Christoph Hellwig <[email protected]>

commit 50ab8ec74a153eb30db26529088bc57dd700b24c upstream.

See http: //www.infradead.org/rpr.html
X-Evolution-Source: [email protected]
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.

Fixes 433c92379d9c ("NFS: Clean up nfs_size_to_loff_t()")
---
 include/linux/nfs_fs.h |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/linux/nfs_fs.h +1 -3
@@ -580,9 +580,7 @@ static inline int nfs3_proc_setacls(stru
 
 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

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/nfs-fix-nfs_size_to_loff_t.patch