Remove redundant check from proc_setattr()

notify_change() already calls security_inode_setattr() before
calling iop->setattr.

Signed-off-by: Tony Jones <tonyj@suse.de>
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: John Johansen <jjohansen@suse.de>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 5 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 0c2052c79243..ff9c131e6b30 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -347,11 +347,8 @@ static int proc_setattr(struct dentry *dentry, struct iattr *attr)
                 return -EPERM;
 
         error = inode_change_ok(inode, attr);
-        if (!error) {
-                error = security_inode_setattr(dentry, attr);
-                if (!error)
-                        error = inode_setattr(inode, attr);
-        }
+        if (!error)
+                error = inode_setattr(inode, attr);
         return error;
 }