---

yaml --- r: 54675 b: refs/heads/master c: 1e8123f h: refs/heads/master i: 54673: 79a2686 54671: ca5e8f2 v: v3
git-mirror · May 8, 2007 · aa43c84 · aa43c84
1 parent e010bf2
commit aa43c84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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;
 }