aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4proc.c8
-rw-r--r--fs/nfs/pnfs.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 6a78d49da5c..f94f6b3928f 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6286,7 +6286,7 @@ static const struct rpc_call_ops nfs4_layoutget_call_ops = {
6286 .rpc_release = nfs4_layoutget_release, 6286 .rpc_release = nfs4_layoutget_release,
6287}; 6287};
6288 6288
6289int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) 6289void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)
6290{ 6290{
6291 struct nfs_server *server = NFS_SERVER(lgp->args.inode); 6291 struct nfs_server *server = NFS_SERVER(lgp->args.inode);
6292 size_t max_pages = max_response_pages(server); 6292 size_t max_pages = max_response_pages(server);
@@ -6310,7 +6310,7 @@ int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)
6310 lgp->args.layout.pages = nfs4_alloc_pages(max_pages, gfp_flags); 6310 lgp->args.layout.pages = nfs4_alloc_pages(max_pages, gfp_flags);
6311 if (!lgp->args.layout.pages) { 6311 if (!lgp->args.layout.pages) {
6312 nfs4_layoutget_release(lgp); 6312 nfs4_layoutget_release(lgp);
6313 return -ENOMEM; 6313 return;
6314 } 6314 }
6315 lgp->args.layout.pglen = max_pages * PAGE_SIZE; 6315 lgp->args.layout.pglen = max_pages * PAGE_SIZE;
6316 6316
@@ -6319,7 +6319,7 @@ int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)
6319 nfs41_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0); 6319 nfs41_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0);
6320 task = rpc_run_task(&task_setup_data); 6320 task = rpc_run_task(&task_setup_data);
6321 if (IS_ERR(task)) 6321 if (IS_ERR(task))
6322 return PTR_ERR(task); 6322 return;
6323 status = nfs4_wait_for_completion_rpc_task(task); 6323 status = nfs4_wait_for_completion_rpc_task(task);
6324 if (status == 0) 6324 if (status == 0)
6325 status = task->tk_status; 6325 status = task->tk_status;
@@ -6327,7 +6327,7 @@ int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)
6327 status = pnfs_layout_process(lgp); 6327 status = pnfs_layout_process(lgp);
6328 rpc_put_task(task); 6328 rpc_put_task(task);
6329 dprintk("<-- %s status=%d\n", __func__, status); 6329 dprintk("<-- %s status=%d\n", __func__, status);
6330 return status; 6330 return;
6331} 6331}
6332 6332
6333static void 6333static void
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 5ea019e80b4..745aa1b39e7 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -172,7 +172,7 @@ extern int nfs4_proc_getdevicelist(struct nfs_server *server,
172 struct pnfs_devicelist *devlist); 172 struct pnfs_devicelist *devlist);
173extern int nfs4_proc_getdeviceinfo(struct nfs_server *server, 173extern int nfs4_proc_getdeviceinfo(struct nfs_server *server,
174 struct pnfs_device *dev); 174 struct pnfs_device *dev);
175extern int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags); 175extern void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags);
176extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp); 176extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp);
177 177
178/* pnfs.c */ 178/* pnfs.c */