diff --git a/fs/inode.c b/fs/inode.c
index e8d62688ed91..07f4cb5eab4b 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1706,8 +1706,8 @@ int file_remove_suid(struct file *file)
 		error = security_inode_killpriv(dentry);
 	if (!error && killsuid)
 		error = __remove_suid(dentry, killsuid);
-	if (!error && (inode->i_sb->s_flags & MS_NOSEC))
-		inode->i_flags |= S_NOSEC;
+	if (!error)
+		inode_has_no_xattr(inode);
 
 	return error;
 }