Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7

1 files changed, 22 insertions, 23 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 84e060eb0de8..290e05671ee4 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4620,7 +4620,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,
 
         /* Calc the number of the pages we need flush for space reservation */
         items = calc_reclaim_items_nr(root, to_reclaim);
-        to_reclaim = items * EXTENT_SIZE_PER_ITEM;
+        to_reclaim = (u64)items * EXTENT_SIZE_PER_ITEM;
 
         trans = (struct btrfs_trans_handle *)current->journal_info;
         block_rsv = &root->fs_info->delalloc_block_rsv;
@@ -7025,36 +7025,35 @@ btrfs_lock_cluster(struct btrfs_block_group_cache *block_group,
                    int delalloc)
 {
         struct btrfs_block_group_cache *used_bg = NULL;
-        bool locked = false;
-again:
+
         spin_lock(&cluster->refill_lock);
-        if (locked) {
-                if (used_bg == cluster->block_group)
+        while (1) {
+                used_bg = cluster->block_group;
+                if (!used_bg)
+                        return NULL;
+
+                if (used_bg == block_group)
                         return used_bg;
 
-                up_read(&used_bg->data_rwsem);
-                btrfs_put_block_group(used_bg);
-        }
+                btrfs_get_block_group(used_bg);
 
-        used_bg = cluster->block_group;
-        if (!used_bg)
-                return NULL;
+                if (!delalloc)
+                        return used_bg;
 
-        if (used_bg == block_group)
-                return used_bg;
+                if (down_read_trylock(&used_bg->data_rwsem))
+                        return used_bg;
 
-        btrfs_get_block_group(used_bg);
+                spin_unlock(&cluster->refill_lock);
 
-        if (!delalloc)
-                return used_bg;
+                down_read(&used_bg->data_rwsem);
 
-        if (down_read_trylock(&used_bg->data_rwsem))
-                return used_bg;
+                spin_lock(&cluster->refill_lock);
+                if (used_bg == cluster->block_group)
+                        return used_bg;
 
-        spin_unlock(&cluster->refill_lock);
-        down_read(&used_bg->data_rwsem);
-        locked = true;
-        goto again;
+                up_read(&used_bg->data_rwsem);
+                btrfs_put_block_group(used_bg);
+        }
 }
 
 static inline void
@@ -9058,7 +9057,7 @@ out:
         if (!for_reloc && root_dropped == false)
                 btrfs_add_dead_root(root);
         if (err && err != -EAGAIN)
-                btrfs_std_error(root->fs_info, err, NULL);
+                btrfs_handle_fs_error(root->fs_info, err, NULL);
         return err;
 }