Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6

Resolve conflicts with the VFS atomic open and sget changes.

Conflicts:
	fs/nfs/nfs4proc.c

1 files changed, 1 insertions, 8 deletions

diff --git a/fs/file_table.c b/fs/file_table.c
index a305d9e2d1b2..9ace2781931e 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -483,10 +483,8 @@ void mark_files_ro(struct super_block *sb)
 {
         struct file *f;
 
-retry:
         lg_global_lock(&files_lglock);
         do_file_list_for_each_entry(sb, f) {
-                struct vfsmount *mnt;
                 if (!S_ISREG(f->f_path.dentry->d_inode->i_mode))
                        continue;
                 if (!file_count(f))
@@ -499,12 +497,7 @@ retry:
                 if (file_check_writeable(f) != 0)
                         continue;
                 file_release_write(f);
-                mnt = mntget(f->f_path.mnt);
-                /* This can sleep, so we can't hold the spinlock. */
-                lg_global_unlock(&files_lglock);
-                mnt_drop_write(mnt);
-                mntput(mnt);
-                goto retry;
+                mnt_drop_write_file(f);
         } while_file_list_for_each_entry;
         lg_global_unlock(&files_lglock);
 }