diff options
| author | John Johansen <jjohansen@suse.de> | 2007-05-08 09:29:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 20:15:10 +0200 |
| commit | 1e8123fdeda6b2b9e96f2ec56e7bed27a303d3eb (patch) | |
| tree | 5a969db27d16a0dd324277618c519cd98e0c7abe | |
| parent | fix hotplug for legacy platform drivers (diff) | |
| download | linux-1e8123fdeda6b2b9e96f2ec56e7bed27a303d3eb.tar.xz linux-1e8123fdeda6b2b9e96f2ec56e7bed27a303d3eb.zip | |
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>
| -rw-r--r-- | fs/proc/base.c | 7 |
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; } |