Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 359517
b: refs/heads/master
c: f0059af
h: refs/heads/master
i:
  359515: 94b7069
v: v3
  • Loading branch information
Tejun Heo authored and Jens Axboe committed Jan 14, 2013
1 parent 636a457 commit bf68284
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8c1cf6bb02fda79b0a4b9bd121f6be6d4ce7a15a
refs/heads/master: f0059afd3e6e7aa1a0ffc23468b74c43d47660b8
6 changes: 6 additions & 0 deletions trunk/fs/buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ void init_buffer(struct buffer_head *bh, bh_end_io_t *handler, void *private)
}
EXPORT_SYMBOL(init_buffer);

inline void touch_buffer(struct buffer_head *bh)
{
mark_page_accessed(bh->b_page);
}
EXPORT_SYMBOL(touch_buffer);

static int sleep_on_buffer(void *word)
{
io_schedule();
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/buffer_head.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand All @@ -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 *);
Expand Down

0 comments on commit bf68284

Please sign in to comment.