2015-04-08 14:42:04

by Peng Tao

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 <[email protected]>
Cc: Weston Andros Adamson <[email protected]>
Signed-off-by: Peng Tao <[email protected]>
---
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

2015-04-08 14:48:03

by Weston Andros Adamson

Subject: Re: [PATCH] nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes

Makes sense to me!

Thanks,
-dros



> On Apr 8, 2015, at 10:41 AM, Peng Tao <[email protected]> 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 <[email protected]>
> Cc: Weston Andros Adamson <[email protected]>
> Signed-off-by: Peng Tao <[email protected]>
> ---
> 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
>