Commit 05f54903 authored Apr 09, 2015 by Peng Tao Committed by Trond Myklebust Apr 23, 2015

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>

parent 1ccbad9f

fs/nfs/direct.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;