[PATCH 0/2] Remove bisect fixup

[PATCH 0/2] Remove bisect fixup

[David Sterba]

Hi,

two patches to remove bisectability fixups of two independent branches
introduced in 4.7 cycle. We don't need to wait for 4.8 to remove them as I
thought.

David Sterba (2):
      btrfs: use new error message helper in qgroup_account_snapshot
      btrfs: remove build fixup for qgroup_account_snapshot

 fs/btrfs/transaction.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

[PATCH 1/2] btrfs: use new error message helper in qgroup_account_snapshot

[David Sterba]

We've renamed btrfs_std_error, this one is left from last merge.

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

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index f6e24cb423ae..4e74b5733030 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1385,7 +1385,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:
-- 
2.7.1

[PATCH 2/2] btrfs: remove build fixup for qgroup_account_snapshot

[David Sterba]

Introduced in 2c1984f244838477aab ("btrfs: build fixup for
qgroup_account_snapshot") as temporary bisectability build fixup.

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

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 4e74b5733030..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.
  *
-- 
2.7.1