diff options
| author | Peng Tao <tao.peng@primarydata.com> | 2015-12-05 15:57:31 +0800 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-12-28 14:32:37 -0500 |
| commit | 0bcbf039f6b2bcefe4f5dada76079080edf9ecd0 (patch) | |
| tree | 8edf8f581dcd12258d7ab84898261a3a3d0ab2ef /fs/nfs/pnfs.c | |
| parent | 2bff2288579f1e4af2f05a7f7443c85b7766d5ac (diff) | |
| download | linux-stable-0bcbf039f6b2bcefe4f5dada76079080edf9ecd0.tar.gz linux-stable-0bcbf039f6b2bcefe4f5dada76079080edf9ecd0.tar.bz2 linux-stable-0bcbf039f6b2bcefe4f5dada76079080edf9ecd0.zip | |
nfs: handle request add failure properly
When we fail to queue a read page to IO descriptor,
we need to clean it up otherwise it is hanging around
preventing nfs module from being removed.
When we fail to queue a write page to IO descriptor,
we need to clean it up and also save the failure status
to open context. Then at file close, we can try to write
pages back again and drop the page if it fails to writeback
in .launder_page, which will be done in the next patch.
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/pnfs.c')
| -rw-r--r-- | fs/nfs/pnfs.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 0fb3552ccfbe..580207bc52a5 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -904,18 +904,9 @@ send_layoutget(struct pnfs_layout_hdr *lo, lseg = nfs4_proc_layoutget(lgp, gfp_flags); } while (lseg == ERR_PTR(-EAGAIN)); - if (IS_ERR(lseg)) { - switch (PTR_ERR(lseg)) { - case -ERESTARTSYS: - case -EIO: - case -ENOSPC: - case -EROFS: - case -E2BIG: - break; - default: - return NULL; - } - } else + if (IS_ERR(lseg) && !nfs_error_is_fatal(PTR_ERR(lseg))) + lseg = NULL; + else pnfs_layout_clear_fail_bit(lo, pnfs_iomode_to_fail_bit(range->iomode)); |