From 3ac9fe0b2bde0743f3b52a9c718b8e1f9c3d5b19 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Thu, 18 Oct 2007 03:05:19 -0700
Subject: [PATCH] --- yaml --- r: 71139 b: refs/heads/master c:
 cdd6fe6e2f7eb8e940854317613885c33b1fe584 h: refs/heads/master i:   71137:
 f9f0622c1152a32ae1aeba4e38782452653715bb   71135:
 080c9a034b55cdb6157e5b225efda4307343330d v: v3

---
 [refs]                    | 2 +-
 trunk/fs/reiserfs/inode.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1a7ce14a2f94..daede70ad675 100644
--- 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
index 9ea12004fa57..0804289d355d 100644
--- 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