From: Peng Tao <tao.peng@primarydata.com>

Date: Thu, 9 Apr 2015 23:02:17 +0800

Subject: [PATCH] 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>

---

 fs/nfs/direct.c | 2 --

 1 file changed, 2 deletions(-)

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c

index 5e451a75132d..ab21ef16a11a 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;

-- 

2.1.0