Skip to content

Commit

Permalink
btrfs: build fixup for qgroup_account_snapshot
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Sterba committed May 12, 2016
1 parent 6426c7a commit 2c1984f
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions fs/btrfs/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
#endif

/*
* Do all special snapshot related qgroup dirty hack.
*
Expand Down

0 comments on commit 2c1984f

Please sign in to comment.