NFSv4/pnfs: Clean up layout get on open

Cache the layout in the arguments so we don't have to keep looking it up
from the inode.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 2031d2b9b6e374220d21e92b6853681f8c11a793..78d5f15ee8527a1eb07fbd534fd949ec3e4fcb2a 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -9419,7 +9419,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task,
 {
        struct inode *inode = lgp->args.inode;
        struct nfs_server *server = NFS_SERVER(inode);
-       struct pnfs_layout_hdr *lo;
+       struct pnfs_layout_hdr *lo = lgp->lo;
        int nfs4err = task->tk_status;
        int err, status = 0;
        LIST_HEAD(head);
@@ -9471,7 +9471,6 @@ nfs4_layoutget_handle_exception(struct rpc_task *task,
        case -NFS4ERR_BAD_STATEID:
                exception->timeout = 0;
                spin_lock(&inode->i_lock);
-               lo = NFS_I(inode)->layout;
                /* If the open stateid was bad, then recover it. */
                if (!lo || test_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags) ||
                    !nfs4_stateid_match_other(&lgp->args.stateid, &lo->plh_stateid)) {
@@ -9554,9 +9553,6 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout)
 
        dprintk("--> %s\n", __func__);
 
-       /* nfs4_layoutget_release calls pnfs_put_layout_hdr */
-       pnfs_get_layout_hdr(NFS_I(inode)->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 be960e47d7f61844dc428ca0853463a90e313e39..ef14ea0b6ab8dc7b331792c73278d6439fa399ba 100644 (file)
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1128,8 +1128,7 @@ void pnfs_layoutget_free(struct nfs4_layoutget *lgp)
        size_t max_pages = lgp->args.layout.pglen / PAGE_SIZE;
 
        nfs4_free_pages(lgp->args.layout.pages, max_pages);
-       if (lgp->args.inode)
-               pnfs_put_layout_hdr(NFS_I(lgp->args.inode)->layout);
+       pnfs_put_layout_hdr(lgp->lo);
        put_nfs_open_context(lgp->args.ctx);
        kfree(lgp);
 }
@@ -2124,6 +2123,9 @@ lookup_again:
                goto out_put_layout_hdr;
        }
 
+       lgp->lo = lo;
+       pnfs_get_layout_hdr(lo);
+
        lseg = nfs4_proc_layoutget(lgp, &timeout);
        trace_pnfs_update_layout(ino, pos, count, iomode, lo, lseg,
                                 PNFS_UPDATE_LAYOUT_SEND_LAYOUTGET);
@@ -2255,6 +2257,7 @@ static void _lgopen_prepare_attached(struct nfs4_opendata *data,
                pnfs_put_layout_hdr(lo);
                return;
        }
+       lgp->lo = lo;
        data->lgp = lgp;
        data->o_arg.lg_args = &lgp->args;
        data->o_res.lg_res = &lgp->res;
@@ -2263,6 +2266,7 @@ static void _lgopen_prepare_attached(struct nfs4_opendata *data,
 static void _lgopen_prepare_floating(struct nfs4_opendata *data,
                                     struct nfs_open_context *ctx)
 {
+       struct inode *ino = data->dentry->d_inode;
        struct pnfs_layout_range rng = {
                .iomode = (data->o_arg.fmode & FMODE_WRITE) ?
                          IOMODE_RW: IOMODE_READ,
@@ -2271,7 +2275,7 @@ static void _lgopen_prepare_floating(struct nfs4_opendata *data,
        };
        struct nfs4_layoutget *lgp;
 
-       lgp = pnfs_alloc_init_layoutget_args(NULL, ctx, &current_stateid,
+       lgp = pnfs_alloc_init_layoutget_args(ino, ctx, &current_stateid,
                                             &rng, GFP_KERNEL);
        if (!lgp)
                return;
@@ -2291,6 +2295,8 @@ void pnfs_lgopen_prepare(struct nfs4_opendata *data,
        /* Could check on max_ops, but currently hardcoded high enough */
        if (!nfs_server_capable(data->dir->d_inode, NFS_CAP_LGOPEN))
                return;
+       if (data->lgp)
+               return;
        if (data->state)
                _lgopen_prepare_attached(data, ctx);
        else
@@ -2330,13 +2336,13 @@ void pnfs_parse_lgopen(struct inode *ino, struct nfs4_layoutget *lgp,
                }
                return;
        }
-       if (!lgp->args.inode) {
+       if (!lgp->lo) {
                lo = _pnfs_grab_empty_layout(ino, ctx);
                if (!lo)
                        return;
-               lgp->args.inode = ino;
+               lgp->lo = lo;
        } else
-               lo = NFS_I(lgp->args.inode)->layout;
+               lo = lgp->lo;
 
        lseg = pnfs_layout_process(lgp);
        if (!IS_ERR(lseg)) {
@@ -2349,11 +2355,9 @@ void pnfs_parse_lgopen(struct inode *ino, struct nfs4_layoutget *lgp,
 void nfs4_lgopen_release(struct nfs4_layoutget *lgp)
 {
        if (lgp != NULL) {
-               struct inode *inode = lgp->args.inode;
-               if (inode) {
-                       struct pnfs_layout_hdr *lo = NFS_I(inode)->layout;
-                       pnfs_clear_first_layoutget(lo);
-                       nfs_layoutget_end(lo);
+               if (lgp->lo) {
+                       pnfs_clear_first_layoutget(lgp->lo);
+                       nfs_layoutget_end(lgp->lo);
                }
                pnfs_layoutget_free(lgp);
        }
@@ -2362,7 +2366,7 @@ void nfs4_lgopen_release(struct nfs4_layoutget *lgp)
 struct pnfs_layout_segment *
 pnfs_layout_process(struct nfs4_layoutget *lgp)
 {
-       struct pnfs_layout_hdr *lo = NFS_I(lgp->args.inode)->layout;
+       struct pnfs_layout_hdr *lo = lgp->lo;
        struct nfs4_layoutget_res *res = &lgp->res;
        struct pnfs_layout_segment *lseg;
        struct inode *ino = lo->plh_inode;

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 717ecc87c9e7d9cd98de66c82f718294e93edf8c..e9698b6278a52856023be6deceb49a08167e27ac 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -277,6 +277,7 @@ struct nfs4_layoutget {
        struct nfs4_layoutget_args args;
        struct nfs4_layoutget_res res;
        const struct cred *cred;
+       struct pnfs_layout_hdr *lo;
        gfp_t gfp_flags;
 };