diff options
authorTejun Heo <>2013-01-11 13:06:35 -0800
committerJens Axboe <>2013-01-14 15:00:36 +0100
commitf0059afd3e6e7aa1a0ffc23468b74c43d47660b8 (patch)
parent8c1cf6bb02fda79b0a4b9bd121f6be6d4ce7a15a (diff)
buffer: make touch_buffer() an exported function
We want to add a trace point to touch_buffer() but macros and inline functions defined in header files can't have tracing points. Move touch_buffer() to fs/buffer.c and make it a proper function. The new exported function is also declared inline. As most uses of touch_buffer() are inside buffer.c with nilfs2 as the only other user, the effect of this change should be negligible. Signed-off-by: Tejun Heo <> Cc: Steven Rostedt <> Signed-off-by: Jens Axboe <>
2 files changed, 7 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index c017a2dfb909..a8c2dfb68dcd 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -53,6 +53,12 @@ void init_buffer(struct buffer_head *bh, bh_end_io_t *handler, void *private)
+inline void touch_buffer(struct buffer_head *bh)
+ mark_page_accessed(bh->b_page);
static int sleep_on_buffer(void *word)
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 458f497738a4..5afc4f94d110 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -126,7 +126,6 @@ BUFFER_FNS(Write_EIO, write_io_error)
BUFFER_FNS(Unwritten, unwritten)
#define bh_offset(bh) ((unsigned long)(bh)->b_data & ~PAGE_MASK)
-#define touch_buffer(bh) mark_page_accessed(bh->b_page)
/* If we *know* page->private refers to buffer_heads */
#define page_buffers(page) \
@@ -142,6 +141,7 @@ BUFFER_FNS(Unwritten, unwritten)
void mark_buffer_dirty(struct buffer_head *bh);
void init_buffer(struct buffer_head *, bh_end_io_t *, void *);
+void touch_buffer(struct buffer_head *bh);
void set_bh_page(struct buffer_head *bh,
struct page *page, unsigned long offset);
int try_to_free_buffers(struct page *);