NFS: Return errors directly in _nfs4_opendata_reclaim_to_nfs4_state() (37a8484a) · Commits · 戴 / test

fs/nfs/nfs4proc.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -1639,17 +1639,15 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
		int ret;

		if (!data->rpc_done) {
		if (data->rpc_status) {
		ret = data->rpc_status;
		goto err;
		}
		if (data->rpc_status)
		return ERR_PTR(data->rpc_status);
		/* cached opens have already been processed */
		goto update;
		}

		ret = nfs_refresh_inode(inode, &data->f_attr);
		if (ret)
		goto err;
		return ERR_PTR(ret);

		if (data->o_res.delegation_type != 0)
		nfs4_opendata_check_deleg(data, state);
		@@ -1659,9 +1657,6 @@ update:
		atomic_inc(&state->count);

		return state;
		err:
		return ERR_PTR(ret);

		}

		static struct nfs4_state *