projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6426c7a
)
btrfs: build fixup for qgroup_account_snapshot
author
David Sterba
<dsterba@suse.com>
Thu, 12 May 2016 09:05:03 +0000
(11:05 +0200)
committer
David Sterba
<dsterba@suse.com>
Thu, 12 May 2016 09:05:03 +0000
(11:05 +0200)
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
patch
|
blob
|
blame
|
history
diff --git
a/fs/btrfs/transaction.c
b/fs/btrfs/transaction.c
index d7172d7ced5f3b6dfaa0d9a4da7a190da4b7eed5..530081388d776a4c9f7eb5523c9a4eb683a13cdc 100644
(file)
--- 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.
*