Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs updates from Chris Mason:
 "These are all fixes I'd like to get out to a broader audience.

  The biggest of the bunch is Mark's quota fix, which is also in the
  SUSE kernel, and makes our subvolume quotas dramatically more
  accurate.

  I've been running xfstests with these against your current git
  overnight, but I'm queueing up longer tests as well"

* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: disable strict file flushes for renames and truncates
  Btrfs: fix csum tree corruption, duplicate and outdated checksums
  Btrfs: Fix memory corruption by ulist_add_merge() on 32bit arch
  Btrfs: fix compressed write corruption on enospc
  btrfs: correctly handle return from ulist_add
  btrfs: qgroup: account shared subtrees during snapshot delete
  Btrfs: read lock extent buffer while walking backrefs
  Btrfs: __btrfs_mod_ref should always use no_quota
  btrfs: adjust statfs calculations according to raid profiles

1 files changed, 8 insertions, 6 deletions

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index e25564bfcb46..54a201dac7f9 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -276,9 +276,8 @@ static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path,
                         }
                         if (ret > 0)
                                 goto next;
-                        ret = ulist_add_merge(parents, eb->start,
-                                              (uintptr_t)eie,
-                                              (u64 *)&old, GFP_NOFS);
+                        ret = ulist_add_merge_ptr(parents, eb->start,
+                                                  eie, (void **)&old, GFP_NOFS);
                         if (ret < 0)
                                 break;
                         if (!ret && extent_item_pos) {
@@ -1001,16 +1000,19 @@ again:
                                         ret = -EIO;
                                         goto out;
                                 }
+                                btrfs_tree_read_lock(eb);
+                                btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
                                 ret = find_extent_in_eb(eb, bytenr,
                                                         *extent_item_pos, &eie);
+                                btrfs_tree_read_unlock_blocking(eb);
                                 free_extent_buffer(eb);
                                 if (ret < 0)
                                         goto out;
                                 ref->inode_list = eie;
                         }
-                        ret = ulist_add_merge(refs, ref->parent,
-                                              (uintptr_t)ref->inode_list,
-                                              (u64 *)&eie, GFP_NOFS);
+                        ret = ulist_add_merge_ptr(refs, ref->parent,
+                                                  ref->inode_list,
+                                                  (void **)&eie, GFP_NOFS);
                         if (ret < 0)
                                 goto out;
                         if (!ret && extent_item_pos) {