From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Dec 2014 02:10:42 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9014
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5c68eac68bea2fc908b20b6df8654d50bd1a5d36;p=mirror_ubuntu-artful-kernel.git

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

Pull more btrfs updates from Chris Mason:
 "This is part two of our merge window patches.

  These are all from Filipe, and fix some really hard to find races that
  can cause corruptions.  Most of them involved block group removal
  (balance) or discard"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: remove non-sense btrfs_error_discard_extent() function
  Btrfs: fix fs corruption on transaction abort if device supports discard
  Btrfs: always clear a block group node when removing it from the tree
  Btrfs: ensure deletion from pinned_chunks list is protected
---

5c68eac68bea2fc908b20b6df8654d50bd1a5d36