Skip to content

Commit

Permalink
NFSv4.2: Remove redundant checks in nfs_setsecurity+nfs4_label_init_s…
Browse files Browse the repository at this point in the history 
…ecurity

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>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Nov 4, 2013
1 parent b944dba commit fab99eb
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
6 changes: 0 additions & 6 deletions fs/nfs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions fs/nfs/nfs4proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit fab99eb

Please sign in to comment.