[v4] btrfs: qgroup: Fix qgroup accounting when creating snapshot
diff mbox

Message ID 20160512091021.GK29353@twin.jikos.cz
State New
Headers show

Commit Message

David Sterba May 12, 2016, 9:10 a.m. UTC
On Wed, May 11, 2016 at 01:30:21PM -0700, Josef Bacik wrote:
> > Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
> > Signed-off-by: Mark Fasheh <mfasheh@suse.de>
> Reviewed-by: Josef Bacik <jbacik@fb.com>

Applied to for-next with the following fixup to make it bisectable:

    btrfs: build fixup for qgroup_account_snapshot

    The macro btrfs_std_error got renamed to btrfs_handle_fs_error in an
    independent branch for the same merge target (4.7). To make the code
    compilable for bisectability reasons, add a temporary stub.

    Signed-off-by: David Sterba <dsterba@suse.com>
 fs/btrfs/transaction.c | 5 +++++
 1 file changed, 5 insertions(+)

To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

diff mbox

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index d7172d7ced5f..530081388d77 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1311,6 +1311,11 @@  int btrfs_defrag_root(struct btrfs_root *root)
        return ret;

+/* Bisesctability fixup, remove in 4.8 */
+#ifndef btrfs_std_error
+#define btrfs_std_error btrfs_handle_fs_error
  * Do all special snapshot related qgroup dirty hack.