Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/file_table.c b/fs/file_table.c
index a72bf9ddd0d2..de9e9653d611 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -458,8 +458,8 @@ void mark_files_ro(struct super_block *sb)
                 spin_unlock(&f->f_lock);
                 if (file_check_writeable(f) != 0)
                         continue;
+                __mnt_drop_write(f->f_path.mnt);
                 file_release_write(f);
-                mnt_drop_write_file(f);
         } while_file_list_for_each_entry;
         lg_global_unlock(&files_lglock);
 }