fs: move mark_files_ro into file_table.c

[firefly-linux-kernel-4.4.55.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index a9dc4c33ef4dd6d1c1e2aa3ffda48192ce0967d5..c170551c23fe0a2af1e24f8a9b206c3b0f96d7ce 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -615,45 +615,6 @@ out:
        return err;
 }
 
-/**
- *     mark_files_ro - mark all files read-only
- *     @sb: superblock in question
- *
- *     All files are marked read-only.  We don't care about pending
- *     delete files so this should be used in 'force' mode only.
- */
-
-static void mark_files_ro(struct super_block *sb)
-{
-       struct file *f;
-
-retry:
-       file_list_lock();
-       list_for_each_entry(f, &sb->s_files, f_u.fu_list) {
-               struct vfsmount *mnt;
-               if (!S_ISREG(f->f_path.dentry->d_inode->i_mode))
-                      continue;
-               if (!file_count(f))
-                       continue;
-               if (!(f->f_mode & FMODE_WRITE))
-                       continue;
-               f->f_mode &= ~FMODE_WRITE;
-               if (file_check_writeable(f) != 0)
-                       continue;
-               file_release_write(f);
-               mnt = mntget(f->f_path.mnt);
-               file_list_unlock();
-               /*
-                * This can sleep, so we can't hold
-                * the file_list_lock() spinlock.
-                */
-               mnt_drop_write(mnt);
-               mntput(mnt);
-               goto retry;
-       }
-       file_list_unlock();
-}
-
 /**
  *     do_remount_sb - asks filesystem to change mount options.
  *     @sb:    superblock in question
@@ -922,7 +883,7 @@ void kill_block_super(struct super_block *sb)
        struct block_device *bdev = sb->s_bdev;
        fmode_t mode = sb->s_mode;
 
-       bdev->bd_super = 0;
+       bdev->bd_super = NULL;
        generic_shutdown_super(sb);
        sync_blockdev(bdev);
        close_bdev_exclusive(bdev, mode);