diff options
| author | Chris Mason <clm@fb.com> | 2016-06-17 10:04:57 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-06-17 10:04:57 -0700 |
| commit | de18c165509edb36bde42ca6ff930854f85e21ea (patch) | |
| tree | 0e2bedc70d8b60958fb49fcb3392e95efacf39eb /fs/btrfs/transaction.c | |
| parent | 719da39a61173c849f70656ed1a302e4b6deaa5b (diff) | |
| parent | dd5c93111dc9d26e038ac437f7a403d617e82c62 (diff) | |
| download | lwn-de18c165509edb36bde42ca6ff930854f85e21ea.tar.gz lwn-de18c165509edb36bde42ca6ff930854f85e21ea.zip | |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index f6e24cb423ae..765845742fde 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1311,11 +1311,6 @@ 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. * @@ -1385,7 +1380,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans, switch_commit_roots(trans->transaction, fs_info); ret = btrfs_write_and_wait_transaction(trans, src); if (ret) - btrfs_std_error(fs_info, ret, + btrfs_handle_fs_error(fs_info, ret, "Error while writing out transaction for qgroup"); out: |