NFS: Remove the nfs4_label from the nfs4_create_res struct

Instead, use the label embedded in the attached fattr.

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

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 127388fabda875011ccf67e445921347895f6597..2e07550dd0d4ff3b92a79a2b2abe5a4c5fa5343f 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4850,7 +4850,6 @@ struct nfs4_createdata {
        struct nfs4_create_res res;
        struct nfs_fh fh;
        struct nfs_fattr fattr;
-       struct nfs4_label *label;
 };
 
 static struct nfs4_createdata *nfs4_alloc_createdata(struct inode *dir,
@@ -4862,8 +4861,8 @@ static struct nfs4_createdata *nfs4_alloc_createdata(struct inode *dir,
        if (data != NULL) {
                struct nfs_server *server = NFS_SERVER(dir);
 
-               data->label = nfs4_label_alloc(server, GFP_KERNEL);
-               if (IS_ERR(data->label))
+               data->fattr.label = nfs4_label_alloc(server, GFP_KERNEL);
+               if (IS_ERR(data->fattr.label))
                        goto out_free;
 
                data->msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CREATE];
@@ -4874,12 +4873,11 @@ static struct nfs4_createdata *nfs4_alloc_createdata(struct inode *dir,
                data->arg.name = name;
                data->arg.attrs = sattr;
                data->arg.ftype = ftype;
-               data->arg.bitmask = nfs4_bitmask(server, data->label);
+               data->arg.bitmask = nfs4_bitmask(server, data->fattr.label);
                data->arg.umask = current_umask();
                data->res.server = server;
                data->res.fh = &data->fh;
                data->res.fattr = &data->fattr;
-               data->res.label = data->label;
                nfs_fattr_init(data->res.fattr);
        }
        return data;
@@ -4901,14 +4899,14 @@ static int nfs4_do_create(struct inode *dir, struct dentry *dentry, struct nfs4_
                                              data->res.fattr->time_start,
                                              NFS_INO_INVALID_DATA);
                spin_unlock(&dir->i_lock);
-               status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, data->res.label);
+               status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, data->res.fattr->label);
        }
        return status;
 }
 
 static void nfs4_free_createdata(struct nfs4_createdata *data)
 {
-       nfs4_label_free(data->label);
+       nfs4_label_free(data->fattr.label);
        kfree(data);
 }
 

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index fba89f82e7b7b212004f33ec25db3ec05add882c..38c74833f263103b4ba63fd33bc070efc08c665e 100644 (file)
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -6353,7 +6353,7 @@ static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
        status = decode_getfh(xdr, res->fh);
        if (status)
                goto out;
-       decode_getfattr_label(xdr, res->fattr, res->label, res->server);
+       decode_getfattr_label(xdr, res->fattr, res->fattr->label, res->server);
 out:
        return status;
 }

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 9960f66280661656941c9531a30d8eea422bd90d..5aba81b74c98eded1b57208cd5f7431e4e09dadb 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1040,7 +1040,6 @@ struct nfs4_create_res {
        const struct nfs_server *       server;
        struct nfs_fh *                 fh;
        struct nfs_fattr *              fattr;
-       struct nfs4_label               *label;
        struct nfs4_change_info         dir_cinfo;
 };