lkml.org 
[lkml]   [2015]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 183/221] NFSv4: Minor cleanups for nfs4_handle_exception and nfs4_async_handle_error
    3.2.69-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    commit 14977489ffdb80d4caf5a184ba41b23b02fbacd9 upstream.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    [bwh: This is not merely a cleanup but also fixes a regression introduced by
    commit 3114ea7a24d3 ("NFSv4: Return the delegation if the server returns
    NFS4ERR_OPENMODE"), backported in 3.2.14]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    fs/nfs/nfs4proc.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -267,7 +267,7 @@ static int nfs4_handle_exception(struct
    case 0:
    return 0;
    case -NFS4ERR_OPENMODE:
    - if (nfs_have_delegation(inode, FMODE_READ)) {
    + if (inode && nfs_have_delegation(inode, FMODE_READ)) {
    nfs_inode_return_delegation(inode);
    exception->retry = 1;
    return 0;
    @@ -279,10 +279,9 @@ static int nfs4_handle_exception(struct
    case -NFS4ERR_DELEG_REVOKED:
    case -NFS4ERR_ADMIN_REVOKED:
    case -NFS4ERR_BAD_STATEID:
    - if (state != NULL)
    - nfs_remove_bad_delegation(state->inode);
    if (state == NULL)
    break;
    + nfs_remove_bad_delegation(state->inode);
    nfs4_schedule_stateid_recovery(server, state);
    goto wait_on_recovery;
    case -NFS4ERR_EXPIRED:
    @@ -3746,8 +3745,9 @@ nfs4_async_handle_error(struct rpc_task
    case -NFS4ERR_DELEG_REVOKED:
    case -NFS4ERR_ADMIN_REVOKED:
    case -NFS4ERR_BAD_STATEID:
    - if (state != NULL)
    - nfs_remove_bad_delegation(state->inode);
    + if (state == NULL)
    + break;
    + nfs_remove_bad_delegation(state->inode);
    case -NFS4ERR_OPENMODE:
    if (state == NULL)
    break;


    \
     
     \ /
      Last update: 2015-05-05 04:21    [W:4.365 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site