From 0580bef50b1e648356dc29d31626ad0d5c55cfe7 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 13 Oct 2011 00:20:43 +0300 Subject: [PATCH] --- yaml --- r: 274673 b: refs/heads/master c: 5f524444c351e145a5f7e28253594688a421bfe8 h: refs/heads/master i: 274671: d57bc7702e49c453a59259a3f6a52d34aa00aa42 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/super.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6a5183cdc66c..1bda6133b16f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 068132bad1de70f85f5f6d12c36d64f8f7848d92 +refs/heads/master: 5f524444c351e145a5f7e28253594688a421bfe8 diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c index 09ce951666ea..29eecbb6ec3a 100644 --- a/trunk/fs/btrfs/super.c +++ b/trunk/fs/btrfs/super.c @@ -939,6 +939,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) { @@ -946,7 +947,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; }