---

yaml --- r: 71139 b: refs/heads/master c: cdd6fe6 h: refs/heads/master i: 71137: f9f0622 71135: 080c9a0 v: v3
git-mirror · Oct 18, 2007 · 3ac9fe0 · 3ac9fe0
1 parent 2d73447
commit 3ac9fe0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a0ce7d99a4d19788e017f3138bc59b9962057ae
+refs/heads/master: cdd6fe6e2f7eb8e940854317613885c33b1fe584
diff --git a/trunk/fs/reiserfs/inode.c b/trunk/fs/reiserfs/inode.c
@@ -3061,7 +3061,11 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
 {
 	struct inode *inode = dentry->d_inode;
 	int error;
-	unsigned int ia_valid = attr->ia_valid;
+	unsigned int ia_valid;
+
+	/* must be turned off for recursive notify_change calls */
+	ia_valid = attr->ia_valid &= ~(ATTR_KILL_SUID|ATTR_KILL_SGID);
+
 	reiserfs_write_lock(inode->i_sb);
 	if (attr->ia_valid & ATTR_SIZE) {
 		/* version 2 items will be caught by the s_maxbytes check