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>

5 files changed, 11 insertions, 10 deletions

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 676e4bd65c52..db200e6baf7e 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -548,7 +548,7 @@ int btrfs_ordered_update_i_size(struct inode *inode,
                  */
                 test = rb_entry(node, struct btrfs_ordered_extent, rb_node);
                 if (test->file_offset > entry_end(ordered)) {
-                        i_size_test = test->file_offset - 1;
+                        i_size_test = test->file_offset;
                 }
         } else {
                 i_size_test = i_size_read(inode);
@@ -561,7 +561,7 @@ int btrfs_ordered_update_i_size(struct inode *inode,
          * disk_i_size to the end of the region.
          */
         if (i_size_test > entry_end(ordered) &&
-            !test_range_bit(io_tree, entry_end(ordered), i_size_test,
+            !test_range_bit(io_tree, entry_end(ordered), i_size_test - 1,
                            EXTENT_DELALLOC, 0)) {
                 new_i_size = min_t(u64, i_size_test, i_size_read(inode));
         }
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index a5c0e98b5aeb..36726696e58b 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -209,8 +209,7 @@ again:
                         goto err;
                 }
 
-                ret = btrfs_add_dead_root(dead_root, latest,
-                                          &root->fs_info->dead_roots);
+                ret = btrfs_add_dead_root(dead_root, latest);
                 if (ret)
                         goto err;
                 goto again;
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,
                 s->s_flags |= MS_ACTIVE;
         }
 
+        mutex_lock(&s->s_root->d_inode->i_mutex);
         root = lookup_one_len(subvol_name, s->s_root, strlen(subvol_name));
+        mutex_unlock(&s->s_root->d_inode->i_mutex);
         if (IS_ERR(root)) {
                 up_write(&s->s_umount);
                 deactivate_super(s);
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index a2c821e3c3a7..ebf5362da1d2 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -389,9 +389,7 @@ int btrfs_commit_tree_roots(struct btrfs_trans_handle *trans,
         return 0;
 }
 
-int btrfs_add_dead_root(struct btrfs_root *root,
-                        struct btrfs_root *latest,
-                        struct list_head *dead_list)
+int btrfs_add_dead_root(struct btrfs_root *root, struct btrfs_root *latest)
 {
         struct btrfs_dirty_root *dirty;
 
@@ -400,7 +398,10 @@ int btrfs_add_dead_root(struct btrfs_root *root,
                 return -ENOMEM;
         dirty->root = root;
         dirty->latest_root = latest;
-        list_add(&dirty->list, dead_list);
+
+        mutex_lock(&root->fs_info->trans_mutex);
+        list_add(&dirty->list, &latest->fs_info->dead_roots);
+        mutex_unlock(&root->fs_info->trans_mutex);
         return 0;
 }
 
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 2c73caeebb2c..598baa312417 100644
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -90,8 +90,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans,
 int btrfs_commit_tree_roots(struct btrfs_trans_handle *trans,
                             struct btrfs_root *root);
 
-int btrfs_add_dead_root(struct btrfs_root *root, struct btrfs_root *latest,
-                        struct list_head *dead_list);
+int btrfs_add_dead_root(struct btrfs_root *root, struct btrfs_root *latest);
 int btrfs_defrag_root(struct btrfs_root *root, int cacheonly);
 int btrfs_clean_old_snapshots(struct btrfs_root *root);
 int btrfs_commit_transaction(struct btrfs_trans_handle *trans,