1 files changed, 6 insertions, 1 deletions

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 4662d92a4b73..8e16bca69c56 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -522,9 +522,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
                 case Opt_ssd_spread:
                         btrfs_set_and_info(root, SSD_SPREAD,
                                            "use spread ssd allocation scheme");
+                        btrfs_set_opt(info->mount_opt, SSD);
                         break;
                 case Opt_nossd:
-                        btrfs_clear_and_info(root, NOSSD,
+                        btrfs_set_and_info(root, NOSSD,
                                              "not using ssd allocation scheme");
                         btrfs_clear_opt(info->mount_opt, SSD);
                         break;
@@ -1467,7 +1468,9 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
                         goto restore;
 
                 /* recover relocation */
+                mutex_lock(&fs_info->cleaner_mutex);
                 ret = btrfs_recover_relocation(root);
+                mutex_unlock(&fs_info->cleaner_mutex);
                 if (ret)
                         goto restore;
 
@@ -1808,6 +1811,8 @@ static int btrfs_show_devname(struct seq_file *m, struct dentry *root)
                 list_for_each_entry(dev, head, dev_list) {
                         if (dev->missing)
                                 continue;
+                        if (!dev->name)
+                                continue;
                         if (!first_dev || dev->devid < first_dev->devid)
                                 first_dev = dev;
                 }