lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 140/167] pNFS/flexfiles: If the layout is invalid, it must be updated before retrying
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Trond Myklebust <trond.myklebust@primarydata.com>

    commit df3ab232e462bce20710596d697ade6b72497694 upstream.

    If we see that our pNFS READ/WRITE/COMMIT operation failed, but we
    also see that our layout segment is no longer valid, then we need to
    get a new layout segment before retrying.

    Fixes: 90816d1ddacf ("NFSv4.1/flexfiles: Don't mark the entire deviceid...")
    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfs/flexfilelayout/flexfilelayout.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    --- a/fs/nfs/flexfilelayout/flexfilelayout.c
    +++ b/fs/nfs/flexfilelayout/flexfilelayout.c
    @@ -1053,9 +1053,6 @@ static int ff_layout_async_handle_error_
    struct nfs_client *mds_client = mds_server->nfs_client;
    struct nfs4_slot_table *tbl = &clp->cl_session->fc_slot_table;

    - if (task->tk_status >= 0)
    - return 0;
    -
    switch (task->tk_status) {
    /* MDS state errors */
    case -NFS4ERR_DELEG_REVOKED:
    @@ -1157,9 +1154,6 @@ static int ff_layout_async_handle_error_
    {
    struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx);

    - if (task->tk_status >= 0)
    - return 0;
    -
    switch (task->tk_status) {
    /* File access problems. Don't mark the device as unavailable */
    case -EACCES:
    @@ -1195,6 +1189,13 @@ static int ff_layout_async_handle_error(
    {
    int vers = clp->cl_nfs_mod->rpc_vers->number;

    + if (task->tk_status >= 0)
    + return 0;
    +
    + /* Handle the case of an invalid layout segment */
    + if (!pnfs_is_valid_lseg(lseg))
    + return -NFS4ERR_RESET_TO_PNFS;
    +
    switch (vers) {
    case 3:
    return ff_layout_async_handle_error_v3(task, lseg, idx);

    \
     
     \ /
      Last update: 2017-03-10 10:41    [W:4.080 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site