Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

pNFS: Ensure we return the error if someone kills a waiting layoutget

Browse Source 
If someone interrupts a wait on one or more outstanding layoutgets in
pnfs_update_layout() then return the ERESTARTSYS/EINTR error.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Trond Myklebust 2018-09-05 14:07:12 -04:00 committed by Anna Schumaker
parent 2a534a7473
commit d03360aaf5
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/nfs/pnfs.c
View File

@ -1740,16 +1740,16 @@ static bool pnfs_within_mdsthreshold(struct nfs_open_context *ctx,
return ret; return ret;
} }
static bool pnfs_prepare_to_retry_layoutget(struct pnfs_layout_hdr *lo) static int pnfs_prepare_to_retry_layoutget(struct pnfs_layout_hdr *lo)
{ {
/* /*
* send layoutcommit as it can hold up layoutreturn due to lseg * send layoutcommit as it can hold up layoutreturn due to lseg
* reference * reference
*/ */
pnfs_layoutcommit_inode(lo->plh_inode, false); pnfs_layoutcommit_inode(lo->plh_inode, false);
return !wait_on_bit_action(&lo->plh_flags, NFS_LAYOUT_RETURN, return wait_on_bit_action(&lo->plh_flags, NFS_LAYOUT_RETURN,
nfs_wait_bit_killable, nfs_wait_bit_killable,
TASK_UNINTERRUPTIBLE); TASK_KILLABLE);
} }
static void nfs_layoutget_begin(struct pnfs_layout_hdr *lo) static void nfs_layoutget_begin(struct pnfs_layout_hdr *lo)
@ -1830,7 +1830,9 @@ pnfs_update_layout(struct inode *ino,
} }
lookup_again: lookup_again:
nfs4_client_recover_expired_lease(clp); lseg = ERR_PTR(nfs4_client_recover_expired_lease(clp));
if (IS_ERR(lseg))
goto out;
first = false; first = false;
spin_lock(&ino->i_lock); spin_lock(&ino->i_lock);
lo = pnfs_find_alloc_layout(ino, ctx, gfp_flags); lo = pnfs_find_alloc_layout(ino, ctx, gfp_flags);
@ -1863,9 +1865,9 @@ lookup_again:
if (list_empty(&lo->plh_segs) && if (list_empty(&lo->plh_segs) &&
atomic_read(&lo->plh_outstanding) != 0) { atomic_read(&lo->plh_outstanding) != 0) {
spin_unlock(&ino->i_lock); spin_unlock(&ino->i_lock);
if (wait_var_event_killable(&lo->plh_outstanding, lseg = ERR_PTR(wait_var_event_killable(&lo->plh_outstanding,
atomic_read(&lo->plh_outstanding) == 0 atomic_read(&lo->plh_outstanding)));
|| !list_empty(&lo->plh_segs))) if (IS_ERR(lseg) || !list_empty(&lo->plh_segs))
goto out_put_layout_hdr; goto out_put_layout_hdr;
pnfs_put_layout_hdr(lo); pnfs_put_layout_hdr(lo);
goto lookup_again; goto lookup_again;
@ -1898,8 +1900,11 @@ lookup_again:
if (test_and_set_bit(NFS_LAYOUT_FIRST_LAYOUTGET, if (test_and_set_bit(NFS_LAYOUT_FIRST_LAYOUTGET,
&lo->plh_flags)) { &lo->plh_flags)) {
spin_unlock(&ino->i_lock); spin_unlock(&ino->i_lock);
wait_on_bit(&lo->plh_flags, NFS_LAYOUT_FIRST_LAYOUTGET, lseg = ERR_PTR(wait_on_bit(&lo->plh_flags,
TASK_UNINTERRUPTIBLE); NFS_LAYOUT_FIRST_LAYOUTGET,
TASK_KILLABLE));
if (IS_ERR(lseg))
goto out_put_layout_hdr;
pnfs_put_layout_hdr(lo); pnfs_put_layout_hdr(lo);
dprintk("%s retrying\n", __func__); dprintk("%s retrying\n", __func__);
goto lookup_again; goto lookup_again;
@ -1925,7 +1930,8 @@ lookup_again:
if (test_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) { if (test_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) {
spin_unlock(&ino->i_lock); spin_unlock(&ino->i_lock);
dprintk("%s wait for layoutreturn\n", __func__); dprintk("%s wait for layoutreturn\n", __func__);
if (pnfs_prepare_to_retry_layoutget(lo)) { lseg = ERR_PTR(pnfs_prepare_to_retry_layoutget(lo));
if (!IS_ERR(lseg)) {
if (first) if (first)
pnfs_clear_first_layoutget(lo); pnfs_clear_first_layoutget(lo);
pnfs_put_layout_hdr(lo); pnfs_put_layout_hdr(lo);