diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-12 12:05:03 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-12 12:05:03 +0300 |
| commit | 2c1984f244838477aab4e5882f4479491ae1084a (patch) | |
| tree | 0265c94f970d249d0c4d5f46363552648e4e2ab2 /fs/btrfs | |
| parent | 6426c7ad697df4bddf1d222685e6802e7616feaa (diff) | |
| download | linux-2c1984f244838477aab4e5882f4479491ae1084a.tar.xz | |
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>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/transaction.c | 5 |
1 files changed, 5 insertions, 0 deletions
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 +#endif + /* * Do all special snapshot related qgroup dirty hack. * |