1 files changed, 15 insertions, 3 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index bcdc393b6580..d7b10578a64b 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1982,16 +1982,26 @@ static int __remove_suid(struct dentry *dentry, int kill)
 int file_remove_suid(struct file *file)
 {
         struct dentry *dentry = file->f_path.dentry;
-        int killsuid = should_remove_suid(dentry);
-        int killpriv = security_inode_need_killpriv(dentry);
+        struct inode *inode = dentry->d_inode;
+        int killsuid;
+        int killpriv;
         int error = 0;
 
+        /* Fast path for nothing security related */
+        if (IS_NOSEC(inode))
+                return 0;
+
+        killsuid = should_remove_suid(dentry);
+        killpriv = security_inode_need_killpriv(dentry);
+
         if (killpriv < 0)
                 return killpriv;
         if (killpriv)
                 error = security_inode_killpriv(dentry);
         if (!error && killsuid)
                 error = __remove_suid(dentry, killsuid);
+        if (!error)
+                inode->i_flags |= S_NOSEC;
 
         return error;
 }
@@ -2327,7 +2337,7 @@ struct page *grab_cache_page_write_begin(struct address_space *mapping,
 repeat:
         page = find_lock_page(mapping, index);
         if (page)
-                return page;
+                goto found;
 
         page = __page_cache_alloc(mapping_gfp_mask(mapping) & ~gfp_notmask);
         if (!page)
@@ -2340,6 +2350,8 @@ repeat:
                         goto repeat;
                 return NULL;
         }
+found:
+        wait_on_page_writeback(page);
         return page;
 }
 EXPORT_SYMBOL(grab_cache_page_write_begin);