diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fs.h | 11 | ||||
-rw-r--r-- | include/linux/mm.h | 7 |
2 files changed, 1 insertions, 17 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 9a5f562abc77..29cb32d3a849 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -701,14 +701,6 @@ struct fown_struct { | |||
701 | * file_ra_state.la_index .ra_index .lookahead_index .readahead_index | 701 | * file_ra_state.la_index .ra_index .lookahead_index .readahead_index |
702 | */ | 702 | */ |
703 | struct file_ra_state { | 703 | struct file_ra_state { |
704 | unsigned long start; /* Current window */ | ||
705 | unsigned long size; | ||
706 | unsigned long flags; /* ra flags RA_FLAG_xxx*/ | ||
707 | unsigned long cache_hit; /* cache hit count*/ | ||
708 | unsigned long prev_index; /* Cache last read() position */ | ||
709 | unsigned long ahead_start; /* Ahead window */ | ||
710 | unsigned long ahead_size; | ||
711 | |||
712 | pgoff_t la_index; /* enqueue time */ | 704 | pgoff_t la_index; /* enqueue time */ |
713 | pgoff_t ra_index; /* begin offset */ | 705 | pgoff_t ra_index; /* begin offset */ |
714 | pgoff_t lookahead_index; /* time to do next readahead */ | 706 | pgoff_t lookahead_index; /* time to do next readahead */ |
@@ -717,10 +709,9 @@ struct file_ra_state { | |||
717 | unsigned long ra_pages; /* Maximum readahead window */ | 709 | unsigned long ra_pages; /* Maximum readahead window */ |
718 | unsigned long mmap_hit; /* Cache hit stat for mmap accesses */ | 710 | unsigned long mmap_hit; /* Cache hit stat for mmap accesses */ |
719 | unsigned long mmap_miss; /* Cache miss stat for mmap accesses */ | 711 | unsigned long mmap_miss; /* Cache miss stat for mmap accesses */ |
712 | unsigned long prev_index; /* Cache last read() position */ | ||
720 | unsigned int prev_offset; /* Offset where last read() ended in a page */ | 713 | unsigned int prev_offset; /* Offset where last read() ended in a page */ |
721 | }; | 714 | }; |
722 | #define RA_FLAG_MISS 0x01 /* a cache miss occured against this file */ | ||
723 | #define RA_FLAG_INCACHE 0x02 /* file is already in cache */ | ||
724 | 715 | ||
725 | /* | 716 | /* |
726 | * Measuring read-ahead sizes. | 717 | * Measuring read-ahead sizes. |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 619c0e80cf0c..3d0d7d285237 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -1144,13 +1144,6 @@ unsigned long page_cache_readahead_ondemand(struct address_space *mapping, | |||
1144 | struct page *page, | 1144 | struct page *page, |
1145 | pgoff_t offset, | 1145 | pgoff_t offset, |
1146 | unsigned long size); | 1146 | unsigned long size); |
1147 | unsigned long page_cache_readahead(struct address_space *mapping, | ||
1148 | struct file_ra_state *ra, | ||
1149 | struct file *filp, | ||
1150 | pgoff_t offset, | ||
1151 | unsigned long size); | ||
1152 | void handle_ra_miss(struct address_space *mapping, | ||
1153 | struct file_ra_state *ra, pgoff_t offset); | ||
1154 | unsigned long max_sane_readahead(unsigned long nr); | 1147 | unsigned long max_sane_readahead(unsigned long nr); |
1155 | 1148 | ||
1156 | /* Do stack extension */ | 1149 | /* Do stack extension */ |