Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c38cbe2 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: We must set NFS_OPEN_STATE flag in nfs_resync_open_stateid_locked 



Otherwise, nfs4_select_rw_stateid() will always return the zero stateid
instead of the correct open stateid.

Fixes: f95549cf ("NFSv4: More CLOSE/OPEN races")
Cc: stable@vger.kernel.org # 4.0+
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 1980bd4d

fs/nfs/nfs4proc.c

+3 −0
Original line number Diff line number Diff line
@@ -1200,12 +1200,15 @@ static bool nfs_need_update_open_stateid(struct nfs4_state *state, 


static void nfs_resync_open_stateid_locked(struct nfs4_state *state)

{

	if (!(state->n_wronly || state->n_rdonly || state->n_rdwr))

		return;

	if (state->n_wronly)

		set_bit(NFS_O_WRONLY_STATE, &state->flags);

	if (state->n_rdonly)

		set_bit(NFS_O_RDONLY_STATE, &state->flags);

	if (state->n_rdwr)

		set_bit(NFS_O_RDWR_STATE, &state->flags);

	set_bit(NFS_OPEN_STATE, &state->flags);

}



static void nfs_clear_open_stateid_locked(struct nfs4_state *state,