Commit:     1e8123fdeda6b2b9e96f2ec56e7bed27a303d3eb
Parent:     49a4ec188f9a96c9a5567956718213d38a456a19
Author:     John Johansen <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 00:29:41 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 8 11:15:10 2007 -0700

    Remove redundant check from proc_setattr()
    notify_change() already calls security_inode_setattr() before
    calling iop->setattr.
    Signed-off-by: Tony Jones <[EMAIL PROTECTED]>
    Signed-off-by: Andreas Gruenbacher <[EMAIL PROTECTED]>
    Signed-off-by: John Johansen <[EMAIL PROTECTED]>
    Acked-by: Stephen Smalley <[EMAIL PROTECTED]>
    Cc: James Morris <[EMAIL PROTECTED]>
    Cc: Chris Wright <[EMAIL PROTECTED]>
    Cc: Christoph Hellwig <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 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 0c2052c..ff9c131 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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to