NFSv4: Handle NFS4ERR_OLD_STATEID in CLOSE/OPEN_DOWNGRADE (0e0cb35b) · Commits · 戴 / test

fs/nfs/nfs4_fs.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -491,8 +491,6 @@ extern int nfs4_set_lock_state(struct nfs4_state state, struct file_lock fl);
		extern int nfs4_select_rw_stateid(struct nfs4_state *, fmode_t,
		const struct nfs_lock_context , nfs4_stateid ,
		const struct cred **);
		extern bool nfs4_refresh_open_stateid(nfs4_stateid *dst,
		struct nfs4_state *state);
		extern bool nfs4_copy_open_stateid(nfs4_stateid *dst,
		struct nfs4_state *state);

fs/nfs/nfs4proc.c

+72 −3

Original line number	Diff line number	Diff line
		@@ -3313,6 +3313,75 @@ nfs4_wait_on_layoutreturn(struct inode inode, struct rpc_task task)
		return pnfs_wait_on_layoutreturn(inode, task);
		}

		/*
		* Update the seqid of an open stateid
		*/
		static void nfs4_sync_open_stateid(nfs4_stateid *dst,
		struct nfs4_state *state)
		{
		__be32 seqid_open;
		u32 dst_seqid;
		int seq;

		for (;;) {
		if (!nfs4_valid_open_stateid(state))
		break;
		seq = read_seqbegin(&state->seqlock);
		if (!nfs4_state_match_open_stateid_other(state, dst)) {
		nfs4_stateid_copy(dst, &state->open_stateid);
		if (read_seqretry(&state->seqlock, seq))
		continue;
		break;
		}
		seqid_open = state->open_stateid.seqid;
		if (read_seqretry(&state->seqlock, seq))
		continue;

		dst_seqid = be32_to_cpu(dst->seqid);
		if ((s32)(dst_seqid - be32_to_cpu(seqid_open)) < 0)
		dst->seqid = seqid_open;
		break;
		}
		}

		/*
		* Update the seqid of an open stateid after receiving
		* NFS4ERR_OLD_STATEID
		*/
		static bool nfs4_refresh_open_old_stateid(nfs4_stateid *dst,
		struct nfs4_state *state)
		{
		__be32 seqid_open;
		u32 dst_seqid;
		bool ret;
		int seq;

		for (;;) {
		ret = false;
		if (!nfs4_valid_open_stateid(state))
		break;
		seq = read_seqbegin(&state->seqlock);
		if (!nfs4_state_match_open_stateid_other(state, dst)) {
		if (read_seqretry(&state->seqlock, seq))
		continue;
		break;
		}
		seqid_open = state->open_stateid.seqid;
		if (read_seqretry(&state->seqlock, seq))
		continue;

		dst_seqid = be32_to_cpu(dst->seqid);
		if ((s32)(dst_seqid - be32_to_cpu(seqid_open)) >= 0)
		dst->seqid = cpu_to_be32(dst_seqid + 1);
		else
		dst->seqid = seqid_open;
		ret = true;
		break;
		}

		return ret;
		}

		struct nfs4_closedata {
		struct inode *inode;
		struct nfs4_state *state;
		@@ -3387,7 +3456,7 @@ static void nfs4_close_done(struct rpc_task task, void data)
		break;
		case -NFS4ERR_OLD_STATEID:
		/* Did we race with OPEN? */
		if (nfs4_refresh_open_stateid(&calldata->arg.stateid,
		if (nfs4_refresh_open_old_stateid(&calldata->arg.stateid,
		state))
		goto out_restart;
		goto out_release;
		@@ -3456,8 +3525,8 @@ static void nfs4_close_prepare(struct rpc_task task, void data)
		} else if (is_rdwr)
		calldata->arg.fmode \|= FMODE_READ\|FMODE_WRITE;

		if (!nfs4_valid_open_stateid(state) \|\|
		!nfs4_refresh_open_stateid(&calldata->arg.stateid, state))
		nfs4_sync_open_stateid(&calldata->arg.stateid, state);
		if (!nfs4_valid_open_stateid(state))
		call_close = 0;
		spin_unlock(&state->owner->so_lock);

fs/nfs/nfs4state.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -1015,22 +1015,6 @@ out:
		return ret;
		}

		bool nfs4_refresh_open_stateid(nfs4_stateid dst, struct nfs4_state state)
		{
		bool ret;
		int seq;

		do {
		ret = false;
		seq = read_seqbegin(&state->seqlock);
		if (nfs4_state_match_open_stateid_other(state, dst)) {
		dst->seqid = state->open_stateid.seqid;
		ret = true;
		}
		} while (read_seqretry(&state->seqlock, seq));
		return ret;
		}

		bool nfs4_copy_open_stateid(nfs4_stateid dst, struct nfs4_state state)
		{
		bool ret;

Admin message