pnfs: move allocations out of nfs4_proc_layoutget

They work better in the new alloc_init function.

Signed-off-by: Fred Isaman <fred.isaman@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 556c1263999abae4345434adabcb5d15e5bcf193..16b14aa99b79f911feab7c5867cc6449ac2e27d6 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -8698,7 +8698,7 @@ out:
        return status;
 }
 
-static size_t max_response_pages(struct nfs_server *server)
+size_t max_response_pages(struct nfs_server *server)
 {
        u32 max_resp_sz = server->nfs_client->cl_session->fc_attrs.max_resp_sz;
        return nfs_page_array_len(0, max_resp_sz);
@@ -8719,7 +8719,7 @@ static void nfs4_free_pages(struct page **pages, size_t size)
        kfree(pages);
 }
 
-static struct page **nfs4_alloc_pages(size_t size, gfp_t gfp_flags)
+struct page **nfs4_alloc_pages(size_t size, gfp_t gfp_flags)
 {
        struct page **pages;
        int i;
@@ -8765,11 +8765,10 @@ static const struct rpc_call_ops nfs4_layoutget_call_ops = {
 };
 
 struct pnfs_layout_segment *
-nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout, gfp_t gfp_flags)
+nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout)
 {
        struct inode *inode = lgp->args.inode;
        struct nfs_server *server = NFS_SERVER(inode);
-       size_t max_pages = max_response_pages(server);
        struct rpc_task *task;
        struct rpc_message msg = {
                .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_LAYOUTGET],
@@ -8796,14 +8795,6 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout, gfp_t gfp_flags)
        /* nfs4_layoutget_release calls pnfs_put_layout_hdr */
        pnfs_get_layout_hdr(NFS_I(inode)->layout);
 
-       lgp->args.layout.pages = nfs4_alloc_pages(max_pages, gfp_flags);
-       if (!lgp->args.layout.pages) {
-               nfs4_layoutget_release(lgp);
-               return ERR_PTR(-ENOMEM);
-       }
-       lgp->args.layout.pglen = max_pages * PAGE_SIZE;
-
-       lgp->res.layoutp = &lgp->args.layout;
        nfs4_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0, 0);
 
        task = rpc_run_task(&task_setup_data);

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 2c955c389ecf710dbecb505a1300b1e2d46fd2de..363420d0f3a0b67d024e601b67176c6262701f70 100644 (file)
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -924,6 +924,7 @@ pnfs_alloc_init_layoutget_args(struct pnfs_layout_hdr *lo,
 {
        struct inode *ino = lo->plh_inode;
        struct nfs_server *server = NFS_SERVER(ino);
+       size_t max_pages = max_response_pages(server);
        struct nfs4_layoutget *lgp;
        loff_t i_size;
 
@@ -933,6 +934,15 @@ pnfs_alloc_init_layoutget_args(struct pnfs_layout_hdr *lo,
        if (lgp == NULL)
                return NULL;
 
+       lgp->args.layout.pages = nfs4_alloc_pages(max_pages, gfp_flags);
+       if (!lgp->args.layout.pages) {
+               kfree(lgp);
+               return NULL;
+       }
+       lgp->args.layout.pglen = max_pages * PAGE_SIZE;
+       lgp->res.layoutp = &lgp->args.layout;
+
+
        i_size = i_size_read(ino);
 
        lgp->args.minlength = PAGE_SIZE;
@@ -1835,7 +1845,7 @@ lookup_again:
                goto out_put_layout_hdr;
        }
 
-       lseg = nfs4_proc_layoutget(lgp, &timeout, gfp_flags);
+       lseg = nfs4_proc_layoutget(lgp, &timeout);
        trace_pnfs_update_layout(ino, pos, count, iomode, lo, lseg,
                                 PNFS_UPDATE_LAYOUT_SEND_LAYOUTGET);
        atomic_dec(&lo->plh_outstanding);

diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index f71a55f11b97ef0552f19ea367ea384c9996fcde..964a7227ea970fa69fa11ba3ccf57bc84ebc9048 100644 (file)
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -224,10 +224,12 @@ extern int pnfs_register_layoutdriver(struct pnfs_layoutdriver_type *);
 extern void pnfs_unregister_layoutdriver(struct pnfs_layoutdriver_type *);
 
 /* nfs4proc.c */
+extern size_t max_response_pages(struct nfs_server *server);
+extern struct page **nfs4_alloc_pages(size_t size, gfp_t gfp_flags);
 extern int nfs4_proc_getdeviceinfo(struct nfs_server *server,
                                   struct pnfs_device *dev,
                                   struct rpc_cred *cred);
-extern struct pnfs_layout_segment* nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout, gfp_t gfp_flags);
+extern struct pnfs_layout_segment* nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout);
 extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync);
 
 /* pnfs.c */