Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- arch/arm/net/bpf_jit_32.c | 2 +-
+ arch/arm/net/bpf_jit_32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
-index ece2d1d43724..dafeb5f81353 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
-@@ -915,7 +915,7 @@ static inline void emit_str_r(const u8 dst, const u8 src, bool dstk,
+@@ -915,7 +915,7 @@ static inline void emit_str_r(const u8 d
/* dst = *(size*)(src + off) */
static inline void emit_ldx_r(const u8 dst[], const u8 src, bool dstk,
s32 off, struct jit_ctx *ctx, const u8 sz){
const u8 *rd = dstk ? tmp : dst;
u8 rm = src;
s32 off_max;
---
-2.19.1
-
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- fs/btrfs/disk-io.c | 51 ++++++++++++++--------------------------------
+ fs/btrfs/disk-io.c | 51 +++++++++++++++------------------------------------
1 file changed, 15 insertions(+), 36 deletions(-)
-diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
-index 834a3f5ef642..d4a7f7ca4145 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1656,9 +1656,8 @@ static int cleaner_kthread(void *arg)
}
static int transaction_kthread(void *arg)
-@@ -3923,6 +3896,13 @@ void close_ctree(struct btrfs_fs_info *fs_info)
+@@ -3923,6 +3896,13 @@ void close_ctree(struct btrfs_fs_info *f
int ret;
set_bit(BTRFS_FS_CLOSING_START, &fs_info->flags);
/* wait for the qgroup rescan worker to stop */
btrfs_qgroup_wait_for_completion(fs_info, false);
-@@ -3950,9 +3930,8 @@ void close_ctree(struct btrfs_fs_info *fs_info)
+@@ -3950,9 +3930,8 @@ void close_ctree(struct btrfs_fs_info *f
if (!sb_rdonly(fs_info->sb)) {
/*
*/
btrfs_delete_unused_bgs(fs_info);
---
-2.19.1
-