---

yaml --- r: 274673 b: refs/heads/master c: 5f52444 h: refs/heads/master i: 274671: d57bc77 v: v3
git-mirror · Oct 20, 2011 · 0580bef · 0580bef
1 parent 31dda19
commit 0580bef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -939,14 +939,14 @@ 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) {
 			deactivate_locked_super(s);
 			return ERR_PTR(error);
 		}
 
-		btrfs_sb(s)->fs_info->bdev_holder = fs_type;
 		s->s_flags |= MS_ACTIVE;
 	}