1 files changed, 5 insertions, 1 deletions

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)