X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=fs%2Finode.c;h=4bcdad3c93612920e809da639ff933e5af08d0f7;hb=27ac0ffeac80ba6b9580529568d06144df044366;hp=ce48c359ce9e336aee71e7654425a7bdf659d536;hpb=146a8595c6399ee6ab4b5cc34c0d28aa4835fdc5;p=deliverable%2Flinux.git

diff --git a/fs/inode.c b/fs/inode.c
index ce48c359ce9e..4bcdad3c9361 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1603,7 +1603,11 @@ static int __remove_suid(struct dentry *dentry, int kill)
 	struct iattr newattrs;
 
 	newattrs.ia_valid = ATTR_FORCE | kill;
-	return notify_change(dentry, &newattrs);
+	/*
+	 * Note we call this on write, so notify_change will not
+	 * encounter any conflicting delegations:
+	 */
+	return notify_change(dentry, &newattrs, NULL);
 }
 
 int file_remove_suid(struct file *file)