[PATCH 05/10] readahead: tag metadata call sites

From: Wu Fengguang
Date: Mon Dec 19 2011 - 05:39:01 EST


We may be doing more metadata readahead in future.

Acked-by: Jan Kara <jack@xxxxxxx>
Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
---
fs/ext3/dir.c | 1 +
fs/ext4/dir.c | 1 +
include/linux/fs.h | 1 +
mm/readahead.c | 1 +
4 files changed, 4 insertions(+)

--- linux-next.orig/fs/ext3/dir.c 2011-12-16 19:36:05.000000000 +0800
+++ linux-next/fs/ext3/dir.c 2011-12-16 19:36:13.000000000 +0800
@@ -136,6 +136,7 @@ static int ext3_readdir(struct file * fi
pgoff_t index = map_bh.b_blocknr >>
(PAGE_CACHE_SHIFT - inode->i_blkbits);
if (!ra_has_index(&filp->f_ra, index))
+ filp->f_ra.for_metadata = 1;
page_cache_sync_readahead(
sb->s_bdev->bd_inode->i_mapping,
&filp->f_ra, filp,
--- linux-next.orig/fs/ext4/dir.c 2011-12-16 19:36:05.000000000 +0800
+++ linux-next/fs/ext4/dir.c 2011-12-16 19:36:13.000000000 +0800
@@ -153,6 +153,7 @@ static int ext4_readdir(struct file *fil
pgoff_t index = map.m_pblk >>
(PAGE_CACHE_SHIFT - inode->i_blkbits);
if (!ra_has_index(&filp->f_ra, index))
+ filp->f_ra.for_metadata = 1;
page_cache_sync_readahead(
sb->s_bdev->bd_inode->i_mapping,
&filp->f_ra, filp,
--- linux-next.orig/include/linux/fs.h 2011-12-16 19:36:12.000000000 +0800
+++ linux-next/include/linux/fs.h 2011-12-16 19:36:13.000000000 +0800
@@ -950,6 +950,7 @@ struct file_ra_state {
u16 mmap_miss; /* Cache miss stat for mmap accesses */
u8 pattern; /* one of RA_PATTERN_* */
unsigned int for_mmap:1; /* readahead for mmap accesses */
+ unsigned int for_metadata:1; /* readahead for meta data */

loff_t prev_pos; /* Cache last read() position */
};
--- linux-next.orig/mm/readahead.c 2011-12-16 19:36:12.000000000 +0800
+++ linux-next/mm/readahead.c 2011-12-16 19:36:13.000000000 +0800
@@ -260,6 +260,7 @@ unsigned long ra_submit(struct file_ra_s
ra->start, ra->size, ra->async_size);

ra->for_mmap = 0;
+ ra->for_metadata = 0;
return actual;
}



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/