diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 22:33:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 22:33:21 -0500 |
| commit | a7c1120d2dcc83691bafa034d98f70285757e826 (patch) | |
| tree | 56779f292c2dea78feff290c3ce26724d33b3f3e /include/trace | |
| parent | 6ec40b423032ca769c96fbf9a080db822821893d (diff) | |
| parent | 9b2ff35753c0512bc8c6adae9e9c87cbeee86f82 (diff) | |
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 bug fixes from Ted Ts'o:
"Various bug fixes for ext4. The most important is a fix for the new
extent cache's slab shrinker which can cause significant, user-visible
pauses when the system is under memory pressure."
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: enable quotas before orphan cleanup
ext4: don't allow quota mount options when quota feature enabled
ext4: fix a warning from sparse check for ext4_dir_llseek
ext4: convert number of blocks to clusters properly
ext4: fix possible memory leak in ext4_remount()
jbd2: fix ERR_PTR dereference in jbd2__journal_start
ext4: use percpu counter for extent cache count
ext4: optimize ext4_es_shrink()
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/ext4.h | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index c0457c0d1a68..4ee471003859 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h | |||
| @@ -2255,64 +2255,48 @@ TRACE_EVENT(ext4_es_lookup_extent_exit, | |||
| 2255 | __entry->found ? __entry->status : 0) | 2255 | __entry->found ? __entry->status : 0) |
| 2256 | ); | 2256 | ); |
| 2257 | 2257 | ||
| 2258 | TRACE_EVENT(ext4_es_reclaim_extents_count, | ||
| 2259 | TP_PROTO(struct super_block *sb, int nr_cached), | ||
| 2260 | |||
| 2261 | TP_ARGS(sb, nr_cached), | ||
| 2262 | |||
| 2263 | TP_STRUCT__entry( | ||
| 2264 | __field( dev_t, dev ) | ||
| 2265 | __field( int, nr_cached ) | ||
| 2266 | ), | ||
| 2267 | |||
| 2268 | TP_fast_assign( | ||
| 2269 | __entry->dev = sb->s_dev; | ||
| 2270 | __entry->nr_cached = nr_cached; | ||
| 2271 | ), | ||
| 2272 | |||
| 2273 | TP_printk("dev %d,%d cached objects nr %d", | ||
| 2274 | MAJOR(__entry->dev), MINOR(__entry->dev), | ||
| 2275 | __entry->nr_cached) | ||
| 2276 | ); | ||
| 2277 | |||
| 2278 | TRACE_EVENT(ext4_es_shrink_enter, | 2258 | TRACE_EVENT(ext4_es_shrink_enter, |
| 2279 | TP_PROTO(struct super_block *sb, int nr_to_scan), | 2259 | TP_PROTO(struct super_block *sb, int nr_to_scan, int cache_cnt), |
| 2280 | 2260 | ||
| 2281 | TP_ARGS(sb, nr_to_scan), | 2261 | TP_ARGS(sb, nr_to_scan, cache_cnt), |
| 2282 | 2262 | ||
| 2283 | TP_STRUCT__entry( | 2263 | TP_STRUCT__entry( |
| 2284 | __field( dev_t, dev ) | 2264 | __field( dev_t, dev ) |
| 2285 | __field( int, nr_to_scan ) | 2265 | __field( int, nr_to_scan ) |
| 2266 | __field( int, cache_cnt ) | ||
| 2286 | ), | 2267 | ), |
| 2287 | 2268 | ||
| 2288 | TP_fast_assign( | 2269 | TP_fast_assign( |
| 2289 | __entry->dev = sb->s_dev; | 2270 | __entry->dev = sb->s_dev; |
| 2290 | __entry->nr_to_scan = nr_to_scan; | 2271 | __entry->nr_to_scan = nr_to_scan; |
| 2272 | __entry->cache_cnt = cache_cnt; | ||
| 2291 | ), | 2273 | ), |
| 2292 | 2274 | ||
| 2293 | TP_printk("dev %d,%d nr to scan %d", | 2275 | TP_printk("dev %d,%d nr_to_scan %d cache_cnt %d", |
| 2294 | MAJOR(__entry->dev), MINOR(__entry->dev), | 2276 | MAJOR(__entry->dev), MINOR(__entry->dev), |
| 2295 | __entry->nr_to_scan) | 2277 | __entry->nr_to_scan, __entry->cache_cnt) |
| 2296 | ); | 2278 | ); |
| 2297 | 2279 | ||
| 2298 | TRACE_EVENT(ext4_es_shrink_exit, | 2280 | TRACE_EVENT(ext4_es_shrink_exit, |
| 2299 | TP_PROTO(struct super_block *sb, int shrunk_nr), | 2281 | TP_PROTO(struct super_block *sb, int shrunk_nr, int cache_cnt), |
| 2300 | 2282 | ||
| 2301 | TP_ARGS(sb, shrunk_nr), | 2283 | TP_ARGS(sb, shrunk_nr, cache_cnt), |
| 2302 | 2284 | ||
| 2303 | TP_STRUCT__entry( | 2285 | TP_STRUCT__entry( |
| 2304 | __field( dev_t, dev ) | 2286 | __field( dev_t, dev ) |
| 2305 | __field( int, shrunk_nr ) | 2287 | __field( int, shrunk_nr ) |
| 2288 | __field( int, cache_cnt ) | ||
| 2306 | ), | 2289 | ), |
| 2307 | 2290 | ||
| 2308 | TP_fast_assign( | 2291 | TP_fast_assign( |
| 2309 | __entry->dev = sb->s_dev; | 2292 | __entry->dev = sb->s_dev; |
| 2310 | __entry->shrunk_nr = shrunk_nr; | 2293 | __entry->shrunk_nr = shrunk_nr; |
| 2294 | __entry->cache_cnt = cache_cnt; | ||
| 2311 | ), | 2295 | ), |
| 2312 | 2296 | ||
| 2313 | TP_printk("dev %d,%d nr to scan %d", | 2297 | TP_printk("dev %d,%d shrunk_nr %d cache_cnt %d", |
| 2314 | MAJOR(__entry->dev), MINOR(__entry->dev), | 2298 | MAJOR(__entry->dev), MINOR(__entry->dev), |
| 2315 | __entry->shrunk_nr) | 2299 | __entry->shrunk_nr, __entry->cache_cnt) |
| 2316 | ); | 2300 | ); |
| 2317 | 2301 | ||
| 2318 | #endif /* _TRACE_EXT4_H */ | 2302 | #endif /* _TRACE_EXT4_H */ |