Commit 1e8123fd authored May 08, 2007 by John Johansen Committed by Linus Torvalds May 08, 2007

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>

parent 49a4ec18

fs/proc/base.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}
		return error;
		}