From: Trond Myklebust Date: Tue, 22 May 2018 15:17:16 +0000 (-0400) Subject: pnfs: Don't release the sequence slot until we've processed layoutget on open X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ae55e59da0e401893b3c52b575fc18a00623d0a1;p=linux.git pnfs: Don't release the sequence slot until we've processed layoutget on open If the server recalls the layout that was just handed out, we risk hitting a race as described in RFC5661 Section 2.10.6.3 unless we ensure that we release the sequence slot after processing the LAYOUTGET operation that was sent as part of the OPEN compound. Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d18447d11b065..bb1141c48281e 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2789,7 +2789,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, if (ret != 0) goto out; - state = nfs4_opendata_to_nfs4_state(opendata); + state = _nfs4_opendata_to_nfs4_state(opendata); ret = PTR_ERR(state); if (IS_ERR(state)) goto out; @@ -2828,6 +2828,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, } out: + nfs4_sequence_free_slot(&opendata->o_res.seq_res); return ret; }