NFS: Remove the nfs4_label from the nfs_setattrres

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

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 7d9dca781956d91a4f8d38eb622cb436f96aeb30..df109287f2e044d3a4a964e7ecc96df8ac867b94 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -650,7 +650,7 @@ nfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
        if (S_ISREG(inode->i_mode))
                nfs_sync_inode(inode);
 
-       fattr = nfs_alloc_fattr();
+       fattr = nfs_alloc_fattr_with_label(NFS_SERVER(inode));
        if (fattr == NULL) {
                error = -ENOMEM;
                goto out;

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index f0262397faeca1c23c28aa327cde27371f504104..a0762ecc0c736366f3fcc6433cb6ff2576ef7f37 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -97,8 +97,7 @@ static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle,
                              struct nfs_fattr *fattr, struct inode *inode);
 static int nfs4_do_setattr(struct inode *inode, const struct cred *cred,
                            struct nfs_fattr *fattr, struct iattr *sattr,
-                           struct nfs_open_context *ctx, struct nfs4_label *ilabel,
-                           struct nfs4_label *olabel);
+                           struct nfs_open_context *ctx, struct nfs4_label *ilabel);
 #ifdef CONFIG_NFS_V4_1
 static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp,
                const struct cred *cred,
@@ -3176,7 +3175,7 @@ static int _nfs4_do_open(struct inode *dir,
                        nfs_fattr_init(opendata->o_res.f_attr);
                        status = nfs4_do_setattr(state->inode, cred,
                                        opendata->o_res.f_attr, sattr,
-                                       ctx, label, opendata->o_res.f_attr->label);
+                                       ctx, label);
                        if (status == 0) {
                                nfs_setattr_update_inode(state->inode, sattr,
                                                opendata->o_res.f_attr);
@@ -3341,8 +3340,7 @@ zero_stateid:
 
 static int nfs4_do_setattr(struct inode *inode, const struct cred *cred,
                           struct nfs_fattr *fattr, struct iattr *sattr,
-                          struct nfs_open_context *ctx, struct nfs4_label *ilabel,
-                          struct nfs4_label *olabel)
+                          struct nfs_open_context *ctx, struct nfs4_label *ilabel)
 {
        struct nfs_server *server = NFS_SERVER(inode);
        __u32 bitmask[NFS4_BITMASK_SZ];
@@ -3356,7 +3354,6 @@ static int nfs4_do_setattr(struct inode *inode, const struct cred *cred,
        };
        struct nfs_setattrres  res = {
                .fattr          = fattr,
-               .label          = olabel,
                .server         = server,
        };
        struct nfs4_exception exception = {
@@ -3373,7 +3370,7 @@ static int nfs4_do_setattr(struct inode *inode, const struct cred *cred,
                adjust_flags |= NFS_INO_INVALID_OTHER;
 
        do {
-               nfs4_bitmap_copy_adjust(bitmask, nfs4_bitmask(server, olabel),
+               nfs4_bitmap_copy_adjust(bitmask, nfs4_bitmask(server, fattr->label),
                                        inode, adjust_flags);
 
                err = _nfs4_do_setattr(inode, &arg, &res, cred, ctx);
@@ -4232,7 +4229,6 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
        struct inode *inode = d_inode(dentry);
        const struct cred *cred = NULL;
        struct nfs_open_context *ctx = NULL;
-       struct nfs4_label *label = NULL;
        int status;
 
        if (pnfs_ld_layoutret_on_setattr(inode) &&
@@ -4258,20 +4254,15 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
                        cred = ctx->cred;
        }
 
-       label = nfs4_label_alloc(NFS_SERVER(inode), GFP_KERNEL);
-       if (IS_ERR(label))
-               return PTR_ERR(label);
-
        /* Return any delegations if we're going to change ACLs */
        if ((sattr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0)
                nfs4_inode_make_writeable(inode);
 
-       status = nfs4_do_setattr(inode, cred, fattr, sattr, ctx, NULL, label);
+       status = nfs4_do_setattr(inode, cred, fattr, sattr, ctx, NULL);
        if (status == 0) {
                nfs_setattr_update_inode(inode, sattr, fattr);
-               nfs_setsecurity(inode, fattr, label);
+               nfs_setsecurity(inode, fattr, fattr->label);
        }
-       nfs4_label_free(label);
        return status;
 }
 
@@ -6021,8 +6012,7 @@ static int nfs4_get_security_label(struct inode *inode, void *buf,
 
 static int _nfs4_do_set_security_label(struct inode *inode,
                struct nfs4_label *ilabel,
-               struct nfs_fattr *fattr,
-               struct nfs4_label *olabel)
+               struct nfs_fattr *fattr)
 {
 
        struct iattr sattr = {0};
@@ -6037,7 +6027,6 @@ static int _nfs4_do_set_security_label(struct inode *inode,
        };
        struct nfs_setattrres res = {
                .fattr          = fattr,
-               .label          = olabel,
                .server         = server,
        };
        struct rpc_message msg = {
@@ -6058,15 +6047,13 @@ static int _nfs4_do_set_security_label(struct inode *inode,
 
 static int nfs4_do_set_security_label(struct inode *inode,
                struct nfs4_label *ilabel,
-               struct nfs_fattr *fattr,
-               struct nfs4_label *olabel)
+               struct nfs_fattr *fattr)
 {
        struct nfs4_exception exception = { };
        int err;
 
        do {
-               err = _nfs4_do_set_security_label(inode, ilabel,
-                               fattr, olabel);
+               err = _nfs4_do_set_security_label(inode, ilabel, fattr);
                trace_nfs4_set_security_label(inode, err);
                err = nfs4_handle_exception(NFS_SERVER(inode), err,
                                &exception);
@@ -6077,32 +6064,21 @@ static int nfs4_do_set_security_label(struct inode *inode,
 static int
 nfs4_set_security_label(struct inode *inode, const void *buf, size_t buflen)
 {
-       struct nfs4_label ilabel, *olabel = NULL;
-       struct nfs_fattr fattr;
+       struct nfs4_label ilabel = {0, 0, buflen, (char *)buf };
+       struct nfs_fattr *fattr;
        int status;
 
        if (!nfs_server_capable(inode, NFS_CAP_SECURITY_LABEL))
                return -EOPNOTSUPP;
 
-       nfs_fattr_init(&fattr);
-
-       ilabel.pi = 0;
-       ilabel.lfs = 0;
-       ilabel.label = (char *)buf;
-       ilabel.len = buflen;
-
-       olabel = nfs4_label_alloc(NFS_SERVER(inode), GFP_KERNEL);
-       if (IS_ERR(olabel)) {
-               status = -PTR_ERR(olabel);
-               goto out;
-       }
+       fattr = nfs_alloc_fattr_with_label(NFS_SERVER(inode));
+       if (fattr == NULL)
+               return -ENOMEM;
 
-       status = nfs4_do_set_security_label(inode, &ilabel, &fattr, olabel);
+       status = nfs4_do_set_security_label(inode, &ilabel, fattr);
        if (status == 0)
-               nfs_setsecurity(inode, &fattr, olabel);
+               nfs_setsecurity(inode, fattr, fattr->label);
 
-       nfs4_label_free(olabel);
-out:
        return status;
 }
 #endif /* CONFIG_NFS_V4_SECURITY_LABEL */

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index d1b61b76bc82ce76e497337049e510733b6f4c9d..e3df7ada598827dc9f22eef20e452c2996ba1ba8 100644 (file)
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -6608,7 +6608,7 @@ static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp,
        status = decode_setattr(xdr);
        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 817f1bf5f187248b7f4d3ac3ff2c601d37efad93..967a0098f0a9795a71d696c2464c007e9e8656a0 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -832,7 +832,6 @@ struct nfs_getaclres {
 struct nfs_setattrres {
        struct nfs4_sequence_res        seq_res;
        struct nfs_fattr *              fattr;
-       struct nfs4_label               *label;
        const struct nfs_server *       server;
 };