mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time ago with promise that one day it will be possible to implement page cache with bigger chunks than PAGE_SIZE. This promise never materialized. And unlikely will. We have many places where PAGE_CACHE_SIZE assumed to be equal to PAGE_SIZE. And it's constant source of confusion on whether PAGE_CACHE_* or PAGE_* constant should be used in a particular case, especially on the border between fs and mm. Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much breakage to be doable. Let's stop pretending that pages in page cache are special. They are not. The changes are pretty straight-forward: - <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>; - <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>; - PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN}; - page_cache_get() -> get_page(); - page_cache_release() -> put_page(); This patch contains automated changes generated with coccinelle using script below. For some reason, coccinelle doesn't patch header files. I've called spatch for them manually. The only adjustment after coccinelle is revert of changes to PAGE_CAHCE_ALIGN definition: we are going to drop it later. There are few places in the code where coccinelle didn't reach. I'll fix them manually in a separate patch. Comments and documentation also will be addressed with the separate patch. virtual patch @@ expression E; @@ - E << (PAGE_CACHE_SHIFT - PAGE_SHIFT) + E @@ expression E; @@ - E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) + E @@ @@ - PAGE_CACHE_SHIFT + PAGE_SHIFT @@ @@ - PAGE_CACHE_SIZE + PAGE_SIZE @@ @@ - PAGE_CACHE_MASK + PAGE_MASK @@ expression E; @@ - PAGE_CACHE_ALIGN(E) + PAGE_ALIGN(E) @@ expression E; @@ - page_cache_get(E) + get_page(E) @@ expression E; @@ - page_cache_release(E) + put_page(E) Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committad av
Linus Torvalds

förälder
c05c2ec96b
incheckning
09cbfeaf1a
@@ -417,13 +417,13 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
|
||||
bio->bi_private = wc;
|
||||
bio->bi_end_io = o2hb_bio_end_io;
|
||||
|
||||
vec_start = (cs << bits) % PAGE_CACHE_SIZE;
|
||||
vec_start = (cs << bits) % PAGE_SIZE;
|
||||
while(cs < max_slots) {
|
||||
current_page = cs / spp;
|
||||
page = reg->hr_slot_data[current_page];
|
||||
|
||||
vec_len = min(PAGE_CACHE_SIZE - vec_start,
|
||||
(max_slots-cs) * (PAGE_CACHE_SIZE/spp) );
|
||||
vec_len = min(PAGE_SIZE - vec_start,
|
||||
(max_slots-cs) * (PAGE_SIZE/spp) );
|
||||
|
||||
mlog(ML_HB_BIO, "page %d, vec_len = %u, vec_start = %u\n",
|
||||
current_page, vec_len, vec_start);
|
||||
@@ -431,7 +431,7 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
|
||||
len = bio_add_page(bio, page, vec_len, vec_start);
|
||||
if (len != vec_len) break;
|
||||
|
||||
cs += vec_len / (PAGE_CACHE_SIZE/spp);
|
||||
cs += vec_len / (PAGE_SIZE/spp);
|
||||
vec_start = 0;
|
||||
}
|
||||
|
||||
@@ -1576,7 +1576,7 @@ static ssize_t o2hb_region_dev_show(struct config_item *item, char *page)
|
||||
|
||||
static void o2hb_init_region_params(struct o2hb_region *reg)
|
||||
{
|
||||
reg->hr_slots_per_page = PAGE_CACHE_SIZE >> reg->hr_block_bits;
|
||||
reg->hr_slots_per_page = PAGE_SIZE >> reg->hr_block_bits;
|
||||
reg->hr_timeout_ms = O2HB_REGION_TIMEOUT_MS;
|
||||
|
||||
mlog(ML_HEARTBEAT, "hr_start_block = %llu, hr_blocks = %u\n",
|
||||
|
Referens i nytt ärende
Block a user