From aa43c846f0817bb16a022b3831c36dfa5057b6d2 Mon Sep 17 00:00:00 2001 From: John Johansen Date: Tue, 8 May 2007 00:29:41 -0700 Subject: [PATCH] --- yaml --- r: 54675 b: refs/heads/master c: 1e8123fdeda6b2b9e96f2ec56e7bed27a303d3eb h: refs/heads/master i: 54673: 79a268694688151c0e508de838ca8be3bc39fb88 54671: ca5e8f29473a4bc06f387b3de469f9d53c018633 v: v3 --- [refs] | 2 +- trunk/fs/proc/base.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6ae1f724d8c8..722f694e882b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49a4ec188f9a96c9a5567956718213d38a456a19 +refs/heads/master: 1e8123fdeda6b2b9e96f2ec56e7bed27a303d3eb diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 0c2052c79243..ff9c131e6b30 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/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; }