X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fopen.c;h=0d515d1619747b00e724471a407f2a6cf6ea51d7;hb=5351fb106a84d6ac584c2501e3b335093d38a58c;hp=c989fb4cf7b9ce1bfc479ca7a0b6a4881e333c63;hpb=b361735043e3001eadb1d40916fd1a4fca1a9363;p=powerpc.git

diff --git a/fs/open.c b/fs/open.c
index c989fb4cf7..0d515d1619 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -7,7 +7,6 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/file.h>
-#include <linux/smp_lock.h>
 #include <linux/quotaops.h>
 #include <linux/fsnotify.h>
 #include <linux/module.h>
@@ -211,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);