lkml.org 
[lkml]   [2014]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 079/121] NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are revoked
    Date
    3.13.11-ckt12 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit c606bb8857921d3ecf4d353942d6cc7e116cc75a upstream.

    NFSv4.x (x>0) requires us to call TEST_STATEID+FREE_STATEID if a stateid is
    revoked. We will currently fail to do this if the stateid is a delegation.

    http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com
    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/nfs/nfs4filelayout.c | 3 ---
    fs/nfs/nfs4proc.c | 8 --------
    2 files changed, 11 deletions(-)

    diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
    index b86464b..d5e4bd9 100644
    --- a/fs/nfs/nfs4filelayout.c
    +++ b/fs/nfs/nfs4filelayout.c
    @@ -153,9 +153,6 @@ static int filelayout_async_handle_error(struct rpc_task *task,
    case -NFS4ERR_DELEG_REVOKED:
    case -NFS4ERR_ADMIN_REVOKED:
    case -NFS4ERR_BAD_STATEID:
    - if (state == NULL)
    - break;
    - nfs_remove_bad_delegation(state->inode);
    case -NFS4ERR_OPENMODE:
    if (state == NULL)
    break;
    diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
    index 322c416..cc27e1f 100644
    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -360,11 +360,6 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc
    case -NFS4ERR_DELEG_REVOKED:
    case -NFS4ERR_ADMIN_REVOKED:
    case -NFS4ERR_BAD_STATEID:
    - if (inode != NULL && nfs4_have_delegation(inode, FMODE_READ)) {
    - nfs_remove_bad_delegation(inode);
    - exception->retry = 1;
    - break;
    - }
    if (state == NULL)
    break;
    ret = nfs4_schedule_stateid_recovery(server, state);
    @@ -4792,9 +4787,6 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
    case -NFS4ERR_DELEG_REVOKED:
    case -NFS4ERR_ADMIN_REVOKED:
    case -NFS4ERR_BAD_STATEID:
    - if (state == NULL)
    - break;
    - nfs_remove_bad_delegation(state->inode);
    case -NFS4ERR_OPENMODE:
    if (state == NULL)
    break;
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-12-02 21:02    [W:3.417 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site