History

Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull ext4 update from Ted Ts'o: "Fixed regressions (two stability regressions and a performance regression) introduced during the 3.10-rc1 merge window. Also included is a bug fix relating to allocating blocks after resizing an ext3 file system when using the ext4 file system driver" * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: jbd,jbd2: fix oops in jbd2_journal_put_journal_head() ext4: revert "ext4: use io_end for multiple bios" ext4: limit group search loop for non-extent files ext4: fix fio regression

Linus Torvalds committed 13 years ago

Commit b9734252 parents 7fb30d2 e2555fd10 files · +119 −146Browse files

Showing the changes to include/trace (1 of 10 files). Show all

Unified · Split

include/trace/events/ext4.h+2−2
@@ -2139,7 +2139,7 @@ TRACE_EVENT(ext4_es_remove_extent, · 2138 unmodified lines
2139 __entry->lblk, __entry->len)2139 __entry->lblk, __entry->len)
2140);2140);
2141 2141
2142TRACE_EVENT(ext4_es_find_delayed_extent_enter,2142TRACE_EVENT(ext4_es_find_delayed_extent_range_enter,
2143 TP_PROTO(struct inode *inode, ext4_lblk_t lblk),2143 TP_PROTO(struct inode *inode, ext4_lblk_t lblk),
2144 2144
2145 TP_ARGS(inode, lblk),2145 TP_ARGS(inode, lblk),
@@ -2161,7 +2161,7 @@ TRACE_EVENT(ext4_es_find_delayed_extent_enter, · 15 unmodified lines
2161 (unsigned long) __entry->ino, __entry->lblk)2161 (unsigned long) __entry->ino, __entry->lblk)
2162);2162);
2163 2163
2164TRACE_EVENT(ext4_es_find_delayed_extent_exit,2164TRACE_EVENT(ext4_es_find_delayed_extent_range_exit,
2165 TP_PROTO(struct inode *inode, struct extent_status *es),2165 TP_PROTO(struct inode *inode, struct extent_status *es),
2166 2166
2167 TP_ARGS(inode, es),2167 TP_ARGS(inode, es),

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t