From 4da569e9586d39bb727b258224707c747923f44e Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 8 May 2007 20:10:00 -0700
Subject: [PATCH] --- yaml --- r: 55187 b: refs/heads/master c:
 7b82dc0e64e93f430182f36b46b79fcee87d3532 h: refs/heads/master i:   55185:
 71468c973458372213595c4989408139adc17eef   55183:
 655f7a406cf6d6b55bb98b702b6527fafae8ca8f v: v3

---
 [refs]          | 2 +-
 trunk/fs/open.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d70613915490..0f28ef1fd8f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1efd48b3ae8f89a1d04f1e36be96764d7bf43ae9
+refs/heads/master: 7b82dc0e64e93f430182f36b46b79fcee87d3532
diff --git a/trunk/fs/open.c b/trunk/fs/open.c
index ca9981c4a658..0d515d161974 100644
--- a/trunk/fs/open.c
+++ b/trunk/fs/open.c
@@ -210,6 +210,9 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
 		newattrs.ia_valid |= ATTR_FILE;
 	}
 
+	/* Remove suid/sgid on truncate too */
+	newattrs.ia_valid |= should_remove_suid(dentry);
+
 	mutex_lock(&dentry->d_inode->i_mutex);
 	err = notify_change(dentry, &newattrs);
 	mutex_unlock(&dentry->d_inode->i_mutex);