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

Commit 21d1f58a authored by Idan Kedar's avatar Idan Kedar Committed by Trond Myklebust
Browse files

pnfs: nfs4_proc_layoutget returns void 



since the only user of nfs4_proc_layoutget is send_layoutget, which
ignores its return value, there is no reason to return any value.

Signed-off-by: default avatarIdan Kedar <idank@tonian.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@tonian.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 8554116e

fs/nfs/nfs4proc.c

+4 −4
Original line number Diff line number Diff line
@@ -6286,7 +6286,7 @@ static const struct rpc_call_ops nfs4_layoutget_call_ops = { 
	.rpc_release = nfs4_layoutget_release,

};



int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)

void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)

{

	struct nfs_server *server = NFS_SERVER(lgp->args.inode);

	size_t max_pages = max_response_pages(server);
@@ -6310,7 +6310,7 @@ int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) 
	lgp->args.layout.pages = nfs4_alloc_pages(max_pages, gfp_flags);

	if (!lgp->args.layout.pages) {

		nfs4_layoutget_release(lgp);

		return -ENOMEM;

		return;

	}

	lgp->args.layout.pglen = max_pages * PAGE_SIZE;
@@ -6319,7 +6319,7 @@ int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) 
	nfs41_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0);

	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task))

		return PTR_ERR(task);

		return;

	status = nfs4_wait_for_completion_rpc_task(task);

	if (status == 0)

		status = task->tk_status;
@@ -6327,7 +6327,7 @@ int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) 
		status = pnfs_layout_process(lgp);

	rpc_put_task(task);

	dprintk("<-- %s status=%d\n", __func__, status);

	return status;

	return;

}



static void

fs/nfs/pnfs.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ extern int nfs4_proc_getdevicelist(struct nfs_server *server, 
				   struct pnfs_devicelist *devlist);

extern int nfs4_proc_getdeviceinfo(struct nfs_server *server,

				   struct pnfs_device *dev);

extern int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags);

extern void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags);

extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp);



/* pnfs.c */