NFS: Remove nfs4_wait_for_completion_rpc_task() (820bf85c) · Commits · 戴 / test

fs/nfs/nfs4proc.c

+7 −15

Original line number	Diff line number	Diff line
		@@ -1245,14 +1245,6 @@ static void nfs4_opendata_put(struct nfs4_opendata *p)
		kref_put(&p->kref, nfs4_opendata_free);
		}

		static int nfs4_wait_for_completion_rpc_task(struct rpc_task *task)
		{
		int ret;

		ret = rpc_wait_for_completion_task(task);
		return ret;
		}

		static bool nfs4_mode_match_open_stateid(struct nfs4_state *state,
		fmode_t fmode)
		{
		@@ -2039,7 +2031,7 @@ static int _nfs4_proc_open_confirm(struct nfs4_opendata *data)
		task = rpc_run_task(&task_setup_data);
		if (IS_ERR(task))
		return PTR_ERR(task);
		status = nfs4_wait_for_completion_rpc_task(task);
		status = rpc_wait_for_completion_task(task);
		if (status != 0) {
		data->cancelled = 1;
		smp_wmb();
		@@ -2206,7 +2198,7 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover)
		task = rpc_run_task(&task_setup_data);
		if (IS_ERR(task))
		return PTR_ERR(task);
		status = nfs4_wait_for_completion_rpc_task(task);
		status = rpc_wait_for_completion_task(task);
		if (status != 0) {
		data->cancelled = 1;
		smp_wmb();
		@@ -5732,7 +5724,7 @@ static int _nfs4_proc_delegreturn(struct inode inode, struct rpc_cred cred, co
		return PTR_ERR(task);
		if (!issync)
		goto out;
		status = nfs4_wait_for_completion_rpc_task(task);
		status = rpc_wait_for_completion_task(task);
		if (status != 0)
		goto out;
		status = data->rpc_status;
		@@ -6002,7 +5994,7 @@ static int nfs4_proc_unlck(struct nfs4_state state, int cmd, struct file_lock
		status = PTR_ERR(task);
		if (IS_ERR(task))
		goto out;
		status = nfs4_wait_for_completion_rpc_task(task);
		status = rpc_wait_for_completion_task(task);
		rpc_put_task(task);
		out:
		request->fl_flags = fl_flags;
		@@ -6229,7 +6221,7 @@ static int _nfs4_do_setlk(struct nfs4_state state, int cmd, struct file_lock f
		task = rpc_run_task(&task_setup_data);
		if (IS_ERR(task))
		return PTR_ERR(task);
		ret = nfs4_wait_for_completion_rpc_task(task);
		ret = rpc_wait_for_completion_task(task);
		if (ret == 0) {
		ret = data->rpc_status;
		if (ret)
		@@ -8297,7 +8289,7 @@ static int nfs41_proc_reclaim_complete(struct nfs_client *clp,
		status = PTR_ERR(task);
		goto out;
		}
		status = nfs4_wait_for_completion_rpc_task(task);
		status = rpc_wait_for_completion_task(task);
		if (status == 0)
		status = task->tk_status;
		rpc_put_task(task);
		@@ -8529,7 +8521,7 @@ nfs4_proc_layoutget(struct nfs4_layoutget lgp, long timeout, gfp_t gfp_flags)
		task = rpc_run_task(&task_setup_data);
		if (IS_ERR(task))
		return ERR_CAST(task);
		status = nfs4_wait_for_completion_rpc_task(task);
		status = rpc_wait_for_completion_task(task);
		if (status == 0) {
		status = nfs4_layoutget_handle_exception(task, lgp, &exception);
		*timeout = exception.timeout;

Admin message