From: <gregkh@linuxfoundation.org>
To: <hch@lst.de>, <gregkh@linuxfoundation.org>,
<trond.myklebust@primarydata.com>
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "nfs: fix nfs_size_to_loff_t" has been added to the 4.4-stable tree
Date: Tue, 01 Mar 2016 22:23:24 +0000 [thread overview]
Message-ID: <145687100169197@kroah.com> (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 4.4-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-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 50ab8ec74a153eb30db26529088bc57dd700b24c Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 8 Feb 2016 21:11:50 +0100
Subject: nfs: fix nfs_size_to_loff_t
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
include/linux/nfs_fs.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -544,9 +544,7 @@ extern int nfs_readpage_async(struct nf
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 hch@lst.de are
queue-4.4/target-fix-remote-port-tmr-abort-se_cmd-fabric-stop.patch
queue-4.4/nfs-fix-nfs_size_to_loff_t.patch
queue-4.4/target-fix-lun_reset-active-tmr-descriptor-handling.patch
queue-4.4/uapi-update-install-list-after-nvme.h-rename.patch
queue-4.4/target-fix-race-with-scf_send_delayed_tas-handling.patch
queue-4.4/target-fix-lun_reset-active-i-o-handling-for-ack_kref.patch
queue-4.4/target-fix-tas-handling-for-multi-session-se_node_acls.patch
reply other threads:[~2016-03-01 22:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=145687100169197@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.