ext4: rename and improbe ext4_es_find_extent()

This commit renames ext4_es_find_extent with ext4_es_find_delayed_extent
and improve this function.  First, we split input and output parameter.
Second, this function never return the first block of the next delayed
extent after 'es'.

Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Jan kara <jack@suse.cz>

1 files changed, 6 insertions, 9 deletions

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 0ee507ff216d..c121cdf55ab3 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -2147,7 +2147,7 @@ TRACE_EVENT(ext4_es_remove_extent,
                   __entry->lblk, __entry->len)
 );
 
-TRACE_EVENT(ext4_es_find_extent_enter,
+TRACE_EVENT(ext4_es_find_delayed_extent_enter,
         TP_PROTO(struct inode *inode, ext4_lblk_t lblk),
 
         TP_ARGS(inode, lblk),
@@ -2169,11 +2169,10 @@ TRACE_EVENT(ext4_es_find_extent_enter,
                   (unsigned long) __entry->ino, __entry->lblk)
 );
 
-TRACE_EVENT(ext4_es_find_extent_exit,
-        TP_PROTO(struct inode *inode, struct extent_status *es,
-                 ext4_lblk_t ret),
+TRACE_EVENT(ext4_es_find_delayed_extent_exit,
+        TP_PROTO(struct inode *inode, struct extent_status *es),
 
-        TP_ARGS(inode, es, ret),
+        TP_ARGS(inode, es),
 
         TP_STRUCT__entry(
                 __field(        dev_t,          dev             )
@@ -2182,7 +2181,6 @@ TRACE_EVENT(ext4_es_find_extent_exit,
                 __field(        ext4_lblk_t,    len             )
                 __field(        ext4_fsblk_t,   pblk            )
                 __field(        unsigned long long, status      )
-                __field(        ext4_lblk_t,    ret             )
         ),
 
         TP_fast_assign(
@@ -2192,14 +2190,13 @@ TRACE_EVENT(ext4_es_find_extent_exit,
                 __entry->len    = es->es_len;
                 __entry->pblk   = ext4_es_pblock(es);
                 __entry->status = ext4_es_status(es);
-                __entry->ret    = ret;
         ),
 
-        TP_printk("dev %d,%d ino %lu es [%u/%u) mapped %llu status %llx ret %u",
+        TP_printk("dev %d,%d ino %lu es [%u/%u) mapped %llu status %llx",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->lblk, __entry->len,
-                  __entry->pblk, __entry->status, __entry->ret)
+                  __entry->pblk, __entry->status)
 );
 
 #endif /* _TRACE_EXT4_H */