diff options
author | Andreas Gruenbacher <agruenba@redhat.com> | 2018-07-24 14:02:40 -0400 |
---|---|---|
committer | Andreas Gruenbacher <agruenba@redhat.com> | 2018-07-24 14:02:40 -0400 |
commit | a3479c7fc096a1a7a2dccbfbdc6fcf86b805711a (patch) | |
tree | 85b0044b207d05b0cf5f118f2160a8de996073ce /tools/perf | |
parent | 109dbb1e6f27fb8f80ee61953485c7c3b1717951 (diff) | |
parent | 025d0e7f73c6a9cc3ca2fe7de821792a8f3269bf (diff) |
Merge branch 'iomap-write' into linux-gfs2/for-next
Pull in the gfs2 iomap-write changes: Tweak the existing code to
properly support iomap write and eliminate an unnecessary special case
in gfs2_block_map. Implement iomap write support for buffered and
direct I/O. Simplify some of the existing code and eliminate code that
is no longer used:
gfs2: Remove gfs2_write_{begin,end}
gfs2: iomap direct I/O support
gfs2: gfs2_extent_length cleanup
gfs2: iomap buffered write support
gfs2: Further iomap cleanups
This is based on the following changes on the xfs 'iomap-4.19-merge'
branch:
iomap: add private pointer to struct iomap
iomap: add a page_done callback
iomap: generic inline data handling
iomap: complete partial direct I/O writes synchronously
iomap: mark newly allocated buffer heads as new
fs: factor out a __generic_write_end helper
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/util/bpf-prologue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/bpf-prologue.c b/tools/perf/util/bpf-prologue.c index 29347756b0af..77e4891e17b0 100644 --- a/tools/perf/util/bpf-prologue.c +++ b/tools/perf/util/bpf-prologue.c | |||
@@ -61,7 +61,7 @@ check_pos(struct bpf_insn_pos *pos) | |||
61 | 61 | ||
62 | /* | 62 | /* |
63 | * Convert type string (u8/u16/u32/u64/s8/s16/s32/s64 ..., see | 63 | * Convert type string (u8/u16/u32/u64/s8/s16/s32/s64 ..., see |
64 | * Documentation/trace/kprobetrace.txt) to size field of BPF_LDX_MEM | 64 | * Documentation/trace/kprobetrace.rst) to size field of BPF_LDX_MEM |
65 | * instruction (BPF_{B,H,W,DW}). | 65 | * instruction (BPF_{B,H,W,DW}). |
66 | */ | 66 | */ |
67 | static int | 67 | static int |