diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:17 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:17 -0500 |
| commit | d756bd2d9339447c29bde950910586df8f8941ec (patch) | |
| tree | f96aeb682bcc4fdcf75d080f260c809b9fbc4a1a /fs/btrfs/disk-io.c | |
| parent | 27263e28321db438bc43dc0c0be432ce91526224 (diff) | |
| parent | b367e47fb3a70f5d24ebd6faf7d42436d485fb2d (diff) | |
Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration
Conflicts:
fs/btrfs/volumes.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 9c1a744e595b..e5167219c266 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2278,9 +2278,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, (unsigned long)btrfs_header_chunk_tree_uuid(chunk_root->node), BTRFS_UUID_SIZE); - mutex_lock(&fs_info->chunk_mutex); ret = btrfs_read_chunk_tree(chunk_root); - mutex_unlock(&fs_info->chunk_mutex); if (ret) { printk(KERN_WARNING "btrfs: failed to read chunk tree on %s\n", sb->s_id); |