diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 18:02:55 -0800 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 18:02:55 -0800 |
commit | 232c28fe23b88e7027c6a20965d6e78421a40532 (patch) | |
tree | 5aa60cbba4879c913ddd8ee7a7d835c56e53ed8e /fs/ext4/inline.c | |
parent | 54640cfe47251cd8acd7145ff86bcaf4db0e9616 (diff) | |
parent | 56026a89e632af0cf45602dee1b2881bf21c4eba (diff) | |
download | common-android-4.4.y.tar.gz |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.ydeprecated/android-4.4.yandroid-4.4.y
Change-Id: Icf907f5067fb6da5935ab0d3271df54b8d5df405
Diffstat (limited to 'fs/ext4/inline.c')
-rw-r--r-- | fs/ext4/inline.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 43dcaab85201..98ca2bb1b829 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -503,8 +503,16 @@ int ext4_readpage_inline(struct inode *inode, struct page *page) return -EAGAIN; } - trace_android_fs_dataread_start(inode, page_offset(page), PAGE_SIZE, - current->pid, current->comm); + if (trace_android_fs_dataread_start_enabled()) { + char *path, pathbuf[MAX_TRACE_PATHBUF_LEN]; + + path = android_fstrace_get_pathname(pathbuf, + MAX_TRACE_PATHBUF_LEN, + inode); + trace_android_fs_dataread_start(inode, page_offset(page), + PAGE_SIZE, current->pid, + path, current->comm); + } /* * Current inline data can only exist in the 1st page, |