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

Commit e999e80e authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Don't update the open stateid unless it is newer than the old one 



This patch is in preparation for the NFSv4.1 parallel open capability.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 2c64c57d

fs/nfs/nfs4_fs.h

+10 −0
Original line number Diff line number Diff line
@@ -500,6 +500,16 @@ static inline bool nfs4_stateid_match(const nfs4_stateid *dst, const nfs4_statei 
	return memcmp(dst, src, sizeof(*dst)) == 0;

}



static inline bool nfs4_stateid_match_other(const nfs4_stateid *dst, const nfs4_stateid *src)

{

	return memcmp(dst->other, src->other, NFS4_STATEID_OTHER_SIZE) == 0;

}



static inline bool nfs4_stateid_is_newer(const nfs4_stateid *s1, const nfs4_stateid *s2)

{

	return (s32)(be32_to_cpu(s1->seqid) - be32_to_cpu(s2->seqid)) > 0;

}



static inline bool nfs4_valid_open_stateid(const struct nfs4_state *state)

{

	return test_bit(NFS_STATE_RECOVERY_FAILED, &state->flags) == 0;

fs/nfs/nfs4proc.c

+17 −4
Original line number Diff line number Diff line
@@ -1137,12 +1137,20 @@ static void update_open_stateflags(struct nfs4_state *state, fmode_t fmode) 
	nfs4_state_set_mode_locked(state, state->state | fmode);

}



static bool nfs_need_update_open_stateid(struct nfs4_state *state,

		nfs4_stateid *stateid)

{

	if (test_and_set_bit(NFS_OPEN_STATE, &state->flags) == 0)

		return true;

	if (!nfs4_stateid_match_other(stateid, &state->open_stateid))

		return true;

	if (nfs4_stateid_is_newer(stateid, &state->open_stateid))

		return true;

	return false;

}



static void nfs_set_open_stateid_locked(struct nfs4_state *state, nfs4_stateid *stateid, fmode_t fmode)

{

	if (test_bit(NFS_DELEGATED_STATE, &state->flags) == 0)

		nfs4_stateid_copy(&state->stateid, stateid);

	nfs4_stateid_copy(&state->open_stateid, stateid);

	set_bit(NFS_OPEN_STATE, &state->flags);

	switch (fmode) {

		case FMODE_READ:

			set_bit(NFS_O_RDONLY_STATE, &state->flags);
@@ -1153,6 +1161,11 @@ static void nfs_set_open_stateid_locked(struct nfs4_state *state, nfs4_stateid * 
		case FMODE_READ|FMODE_WRITE:

			set_bit(NFS_O_RDWR_STATE, &state->flags);

	}

	if (!nfs_need_update_open_stateid(state, stateid))

		return;

	if (test_bit(NFS_DELEGATED_STATE, &state->flags) == 0)

		nfs4_stateid_copy(&state->stateid, stateid);

	nfs4_stateid_copy(&state->open_stateid, stateid);

}



static void nfs_set_open_stateid(struct nfs4_state *state, nfs4_stateid *stateid, fmode_t fmode)