lkml.org 
[lkml]   [2021]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 123/152] pNFS: Mark layout for return if return-on-close was not sent
    Date
    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    commit 67bbceedc9bb8ad48993a8bd6486054756d711f4 upstream.

    If the layout return-on-close failed because the layoutreturn was never
    sent, then we should mark the layout for return again.

    Fixes: 9c47b18cf722 ("pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfs/pnfs.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/fs/nfs/pnfs.c
    +++ b/fs/nfs/pnfs.c
    @@ -1558,12 +1558,18 @@ void pnfs_roc_release(struct nfs4_layout
    int ret)
    {
    struct pnfs_layout_hdr *lo = args->layout;
    + struct inode *inode = args->inode;
    const nfs4_stateid *arg_stateid = NULL;
    const nfs4_stateid *res_stateid = NULL;
    struct nfs4_xdr_opaque_data *ld_private = args->ld_private;

    switch (ret) {
    case -NFS4ERR_NOMATCHING_LAYOUT:
    + spin_lock(&inode->i_lock);
    + if (pnfs_layout_is_valid(lo) &&
    + nfs4_stateid_match_other(&args->stateid, &lo->plh_stateid))
    + pnfs_set_plh_return_info(lo, args->range.iomode, 0);
    + spin_unlock(&inode->i_lock);
    break;
    case 0:
    if (res->lrs_present)

    \
     
     \ /
      Last update: 2021-01-18 13:32    [W:2.293 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site