aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/super.c
diff options
context:
space:
mode:
authorYan Zheng <zheng.yan@oracle.com>2008-08-04 23:23:47 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:06 -0400
commitb48652c101cce7a54379a49cc0cf854cec2c94e2 (patch)
tree13e8250b326b71fed80811e1ed3b19b00beded31 /fs/btrfs/super.c
parent3de9d6b649b4cc60687be92e71cef36d7d4e8f2f (diff)
Btrfs: Various small fixes.
This trivial patch contains two locking fixes and a off by one fix. --- Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r--fs/btrfs/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index a6a418b6894b..eb4b357d05e1 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -449,7 +449,9 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
449 s->s_flags |= MS_ACTIVE; 449 s->s_flags |= MS_ACTIVE;
450 } 450 }
451 451
452 mutex_lock(&s->s_root->d_inode->i_mutex);
452 root = lookup_one_len(subvol_name, s->s_root, strlen(subvol_name)); 453 root = lookup_one_len(subvol_name, s->s_root, strlen(subvol_name));
454 mutex_unlock(&s->s_root->d_inode->i_mutex);
453 if (IS_ERR(root)) { 455 if (IS_ERR(root)) {
454 up_write(&s->s_umount); 456 up_write(&s->s_umount);
455 deactivate_super(s); 457 deactivate_super(s);