diff mbox

nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes

Message ID 1428504083-8227-1-git-send-email-tao.peng@primarydata.com (mailing list archive)
State New, archived
Headers show

Commit Message

Peng Tao April 8, 2015, 2:41 p.m. UTC
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: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
---
 fs/nfs/direct.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Weston Andros Adamson April 8, 2015, 2:48 p.m. UTC | #1
Makes sense to me!

Thanks,
-dros



> On Apr 8, 2015, at 10:41 AM, Peng Tao <tao.peng@primarydata.com> wrote:
> 
> 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: Weston Andros Adamson <dros@primarydata.com>
> Signed-off-by: Peng Tao <tao.peng@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 645109e..0c84f67 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);
> -
> 	count = dreq->mirrors[hdr->pgio_mirror_idx].count;
> 	if (count + dreq->io_start < hdr->io_start + hdr->good_bytes)
> 		dreq->mirrors[hdr->pgio_mirror_idx].count += hdr->good_bytes;
> -- 
> 1.9.1
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 645109e..0c84f67 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);
-
 	count = dreq->mirrors[hdr->pgio_mirror_idx].count;
 	if (count + dreq->io_start < hdr->io_start + hdr->good_bytes)
 		dreq->mirrors[hdr->pgio_mirror_idx].count += hdr->good_bytes;