Btrfs: fix a bug when opening seed devices

Initialize fs_info->bdev_holder a bit earlier to be able to pass a
correct holder id to blkdev_get() when opening seed devices with O_EXCL.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 5f524444c351e145a5f7e28253594688a421bfe8)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index ae475fe559bdf0086ba3f9eebaaa5bdda982de1c..7ae014b42a37a7afcd3275c961e713e769350c64 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -950,6 +950,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
 
                s->s_flags = flags | MS_NOSEC;
                strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
+               btrfs_sb(s)->fs_info->bdev_holder = fs_type;
                error = btrfs_fill_super(s, fs_devices, data,
                                         flags & MS_SILENT ? 1 : 0);
                if (error) {
@@ -957,7 +958,6 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
                        return ERR_PTR(error);
                }
 
-               btrfs_sb(s)->fs_info->bdev_holder = fs_type;
                s->s_flags |= MS_ACTIVE;
        }