diff options
| author |   Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-11-04 13:46:40 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-11-04 16:42:52 -0500 |
| commit | fab99ebe39fe7d11fbd9b5fb84f07432af9ba36f (patch) | |
| tree | 3e99cedfdeb6d582b4fd66a143994d2a86678516 /fs/nfs | |
| parent | NFSv4: Sanity check the server reply in _nfs4_server_capabilities (diff) | |
| download | linux-dev-fab99ebe39fe7d11fbd9b5fb84f07432af9ba36f.tar.xz linux-dev-fab99ebe39fe7d11fbd9b5fb84f07432af9ba36f.zip | |
NFSv4.2: Remove redundant checks in nfs_setsecurity+nfs4_label_init_security
We already check for nfs_server_capable(inode, NFS_CAP_SECURITY_LABEL)
in nfs4_label_alloc()
We check the minor version in _nfs4_server_capabilities before setting
NFS_CAP_SECURITY_LABEL.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/inode.c | 6 | ||||
| -rw-r--r-- | fs/nfs/nfs4proc.c | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 26e77d81234e..18ab2da4eeb6 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -274,12 +274,6 @@ void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr, if (label == NULL) return; - if (nfs_server_capable(inode, NFS_CAP_SECURITY_LABEL) == 0) - return; - - if (NFS_SERVER(inode)->nfs_client->cl_minorversion < 2) - return; - if ((fattr->valid & NFS_ATTR_FATTR_V4_SECURITY_LABEL) && inode->i_security) { error = security_inode_notifysecctx(inode, label->label, label->len); diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ed2a0e6b9aed..5ab33c0792df 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -105,9 +105,6 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry, if (nfs_server_capable(dir, NFS_CAP_SECURITY_LABEL) == 0) return NULL; - if (NFS_SERVER(dir)->nfs_client->cl_minorversion < 2) - return NULL; - err = security_dentry_init_security(dentry, sattr->ia_mode, &dentry->d_name, (void **)&label->label, &label->len); if (err == 0) |