NFS: Create a new nfs_alloc_fattr_with_label() function

For creating fattrs with the label field already allocated for us. I
also update nfs_free_fattr() to free the label in the end.

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

diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index 59355c106eceb5fb0d72d61834b385ffd3fe93d5..7604cb6a0ac2382f970d5b01e1262ead6841e476 100644 (file)
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -80,18 +80,15 @@ int nfs_get_root(struct super_block *s, struct fs_context *fc)
                goto out;
 
        /* get the actual root for this mount */
-       fsinfo.fattr = nfs_alloc_fattr();
+       fsinfo.fattr = nfs_alloc_fattr_with_label(server);
        if (fsinfo.fattr == NULL)
                goto out_name;
 
-       fsinfo.fattr->label = nfs4_label_alloc(server, GFP_KERNEL);
-       if (IS_ERR(fsinfo.fattr->label))
-               goto out_fattr;
        error = server->nfs_client->rpc_ops->getroot(server, ctx->mntfh, &fsinfo);
        if (error < 0) {
                dprintk("nfs_get_root: getattr error = %d\n", -error);
                nfs_errorf(fc, "NFS: Couldn't getattr on root");
-               goto out_label;
+               goto out_fattr;
        }
 
        inode = nfs_fhget(s, ctx->mntfh, fsinfo.fattr, NULL);
@@ -99,12 +96,12 @@ int nfs_get_root(struct super_block *s, struct fs_context *fc)
                dprintk("nfs_get_root: get root inode failed\n");
                error = PTR_ERR(inode);
                nfs_errorf(fc, "NFS: Couldn't get root inode");
-               goto out_label;
+               goto out_fattr;
        }
 
        error = nfs_superblock_set_dummy_root(s, inode);
        if (error != 0)
-               goto out_label;
+               goto out_fattr;
 
        /* root dentries normally start off anonymous and get spliced in later
         * if the dentry tree reaches them; however if the dentry already
@@ -115,7 +112,7 @@ int nfs_get_root(struct super_block *s, struct fs_context *fc)
                dprintk("nfs_get_root: get root dentry failed\n");
                error = PTR_ERR(root);
                nfs_errorf(fc, "NFS: Couldn't get root dentry");
-               goto out_label;
+               goto out_fattr;
        }
 
        security_d_instantiate(root, inode);
@@ -154,8 +151,6 @@ int nfs_get_root(struct super_block *s, struct fs_context *fc)
        nfs_setsecurity(inode, fsinfo.fattr, fsinfo.fattr->label);
        error = 0;
 
-out_label:
-       nfs4_label_free(fsinfo.fattr->label);
 out_fattr:
        nfs_free_fattr(fsinfo.fattr);
 out_name:
@@ -165,5 +160,5 @@ out:
 error_splat_root:
        dput(fc->root);
        fc->root = NULL;
-       goto out_label;
+       goto out_fattr;
 }

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 0b5b1e44b2c4f2e7b130e174d35e5aca0c90e16b..84c7efa2ea87402ff1a33a04c8f42286aeef8661 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1606,6 +1606,23 @@ struct nfs_fattr *nfs_alloc_fattr(void)
 }
 EXPORT_SYMBOL_GPL(nfs_alloc_fattr);
 
+struct nfs_fattr *nfs_alloc_fattr_with_label(struct nfs_server *server)
+{
+       struct nfs_fattr *fattr = nfs_alloc_fattr();
+
+       if (!fattr)
+               return NULL;
+
+       fattr->label = nfs4_label_alloc(server, GFP_NOFS);
+       if (IS_ERR(fattr->label)) {
+               kfree(fattr);
+               return NULL;
+       }
+
+       return fattr;
+}
+EXPORT_SYMBOL_GPL(nfs_alloc_fattr_with_label);
+
 struct nfs_fh *nfs_alloc_fhandle(void)
 {
        struct nfs_fh *fh;

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 123078c7649559c205f1cea226ee8193b2c90f82..12f6acb483bbd60b002121bc9a56bbcbc5f16b52 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -342,14 +342,6 @@ nfs4_label_copy(struct nfs4_label *dst, struct nfs4_label *src)
 
        return dst;
 }
-static inline void nfs4_label_free(struct nfs4_label *label)
-{
-       if (label) {
-               kfree(label->label);
-               kfree(label);
-       }
-       return;
-}
 
 static inline void nfs_zap_label_cache_locked(struct nfs_inode *nfsi)
 {
@@ -358,7 +350,6 @@ static inline void nfs_zap_label_cache_locked(struct nfs_inode *nfsi)
 }
 #else
 static inline struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) { return NULL; }
-static inline void nfs4_label_free(void *label) {}
 static inline void nfs_zap_label_cache_locked(struct nfs_inode *nfsi)
 {
 }

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 739ca1ef934fc2450ec90ab60580765e79cf4272..88c3aed8ad3945b0d5b4e6fcba1dec8df28bf882 100644 (file)
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -426,9 +426,22 @@ extern void nfs_fattr_set_barrier(struct nfs_fattr *fattr);
 extern unsigned long nfs_inc_attr_generation_counter(void);
 
 extern struct nfs_fattr *nfs_alloc_fattr(void);
+extern struct nfs_fattr *nfs_alloc_fattr_with_label(struct nfs_server *server);
+
+static inline void nfs4_label_free(struct nfs4_label *label)
+{
+#ifdef CONFIG_NFS_V4_SECURITY_LABEL
+       if (label) {
+               kfree(label->label);
+               kfree(label);
+       }
+#endif
+}
 
 static inline void nfs_free_fattr(const struct nfs_fattr *fattr)
 {
+       if (fattr)
+               nfs4_label_free(fattr->label);
        kfree(fattr);
 }