Merge branches 'pnp', 'pm-cpuidle' and 'pm-cpufreq'

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

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 50f06cddc94b7da66031a5fcefad40d6c180902d..5ae62587a71d5c7e4e413e1252572707433aaf7b 100644 (file)
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -40,17 +40,6 @@ static void ceph_put_super(struct super_block *s)
 
        dout("put_super\n");
        ceph_mdsc_close_sessions(fsc->mdsc);
-
-       /*
-        * ensure we release the bdi before put_anon_super releases
-        * the device name.
-        */
-       if (s->s_bdi == &fsc->backing_dev_info) {
-               bdi_unregister(&fsc->backing_dev_info);
-               s->s_bdi = NULL;
-       }
-
-       return;
 }
 
 static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf)
@@ -910,7 +899,7 @@ static int ceph_register_bdi(struct super_block *sb,
                        >> PAGE_SHIFT;
        else
                fsc->backing_dev_info.ra_pages =
-                       default_backing_dev_info.ra_pages;
+                       VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
 
        err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
                           atomic_long_inc_return(&bdi_seq));
@@ -1002,11 +991,16 @@ out_final:
 static void ceph_kill_sb(struct super_block *s)
 {
        struct ceph_fs_client *fsc = ceph_sb_to_client(s);
+       dev_t dev = s->s_dev;
+
        dout("kill_sb %p\n", s);
+
        ceph_mdsc_pre_umount(fsc->mdsc);
-       kill_anon_super(s);    /* will call put_super after sb is r/o */
+       generic_shutdown_super(s);
        ceph_mdsc_destroy(fsc);
+
        destroy_fs_client(fsc);
+       free_anon_bdev(dev);
 }
 
 static struct file_system_type ceph_fs_type = {