aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Tao <tao.peng@primarydata.com>2015-04-09 23:02:17 +0800
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-04-23 15:05:19 -0400
commit05f54903d9d370a4cd302a85681304d3ec59e5c1 (patch)
treeb0b52ae5364e7bbfb5a28ef0473b038bb1f77076
parentnfs: fix DIO good bytes calculation (diff)
downloadlinux-dev-05f54903d9d370a4cd302a85681304d3ec59e5c1.tar.xz
linux-dev-05f54903d9d370a4cd302a85681304d3ec59e5c1.zip
nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes
For flexfiles driver, we might choose to read from mirror index other than 0 while mirror_count is always 1 for read. Reported-by: Jean Spector <jean@primarydata.com> Cc: <stable@vger.kernel.org> # v3.19+ Cc: Weston Andros Adamson <dros@primarydata.com> Signed-off-by: Peng Tao <tao.peng@primarydata.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--fs/nfs/direct.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index e97a67e40b48..eeb52b434e6f 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -129,8 +129,6 @@ nfs_direct_good_bytes(struct nfs_direct_req *dreq, struct nfs_pgio_header *hdr)
int i;
ssize_t count;
- WARN_ON_ONCE(hdr->pgio_mirror_idx >= dreq->mirror_count);
-
if (dreq->mirror_count == 1) {
dreq->mirrors[hdr->pgio_mirror_idx].count += hdr->good_bytes;
dreq->count += hdr->good_bytes;