Commit d03ab29d authored by Jeff Layton's avatar Jeff Layton Committed by Anna Schumaker

pnfs: fix bad error handling in send_layoutget

Currently, the code will clear the fail bit if we get back a fatal
error. I don't think that's correct -- we want to clear that bit
if we do not get a fatal error.

Fixes: 0bcbf039 (nfs: handle request add failure properly)
Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 95e2b7e9
...@@ -876,11 +876,16 @@ send_layoutget(struct pnfs_layout_hdr *lo, ...@@ -876,11 +876,16 @@ send_layoutget(struct pnfs_layout_hdr *lo,
lseg = nfs4_proc_layoutget(lgp, gfp_flags); lseg = nfs4_proc_layoutget(lgp, gfp_flags);
} while (lseg == ERR_PTR(-EAGAIN)); } while (lseg == ERR_PTR(-EAGAIN));
if (IS_ERR(lseg) && !nfs_error_is_fatal(PTR_ERR(lseg))) if (IS_ERR(lseg)) {
lseg = NULL; if (!nfs_error_is_fatal(PTR_ERR(lseg))) {
else pnfs_layout_clear_fail_bit(lo,
pnfs_iomode_to_fail_bit(range->iomode));
lseg = NULL;
}
} else {
pnfs_layout_clear_fail_bit(lo, pnfs_layout_clear_fail_bit(lo,
pnfs_iomode_to_fail_bit(range->iomode)); pnfs_iomode_to_fail_bit(range->iomode));
}
return lseg; return lseg;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment