lkml.org 
[lkml]   [2019]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 135/144] NFSv4: Check the return value of update_open_stateid()
    Date
    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    commit e3c8dc761ead061da2220ee8f8132f729ac3ddfe upstream.

    Ensure that we always check the return value of update_open_stateid()
    so that we can retry if the update of local state failed. This fixes
    infinite looping on state recovery.

    Fixes: e23008ec81ef3 ("NFSv4 reduce attribute requests for open reclaim")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Cc: stable@vger.kernel.org # v3.7+
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfs/nfs4proc.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -1878,8 +1878,9 @@ _nfs4_opendata_reclaim_to_nfs4_state(str
    if (data->o_res.delegation_type != 0)
    nfs4_opendata_check_deleg(data, state);
    update:
    - update_open_stateid(state, &data->o_res.stateid, NULL,
    - data->o_arg.fmode);
    + if (!update_open_stateid(state, &data->o_res.stateid,
    + NULL, data->o_arg.fmode))
    + return ERR_PTR(-EAGAIN);
    refcount_inc(&state->count);

    return state;
    @@ -1944,8 +1945,11 @@ _nfs4_opendata_to_nfs4_state(struct nfs4

    if (data->o_res.delegation_type != 0)
    nfs4_opendata_check_deleg(data, state);
    - update_open_stateid(state, &data->o_res.stateid, NULL,
    - data->o_arg.fmode);
    + if (!update_open_stateid(state, &data->o_res.stateid,
    + NULL, data->o_arg.fmode)) {
    + nfs4_put_open_state(state);
    + state = ERR_PTR(-EAGAIN);
    + }
    out:
    nfs_release_seqid(data->o_arg.seqid);
    return state;

    \
     
     \ /
      Last update: 2019-08-14 19:10    [W:4.238 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site