mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-05-01 15:15:19 -04:00
[PATCH] md: clean up 'page' related names in md
Substitute: page_cache_get -> get_page page_cache_release -> put_page PAGE_CACHE_SHIFT -> PAGE_SHIFT PAGE_CACHE_SIZE -> PAGE_SIZE PAGE_CACHE_MASK -> PAGE_MASK __free_page -> put_page because we aren't using the page cache, we are just using pages. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
d7603b7e3a
commit
2d1f3b5d1b
@@ -139,7 +139,7 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
|
||||
out_free_pages:
|
||||
for (i=0; i < RESYNC_PAGES ; i++)
|
||||
for (j=0 ; j < pi->raid_disks; j++)
|
||||
__free_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
|
||||
put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
|
||||
j = -1;
|
||||
out_free_bio:
|
||||
while ( ++j < pi->raid_disks )
|
||||
@@ -159,7 +159,7 @@ static void r1buf_pool_free(void *__r1_bio, void *data)
|
||||
if (j == 0 ||
|
||||
r1bio->bios[j]->bi_io_vec[i].bv_page !=
|
||||
r1bio->bios[0]->bi_io_vec[i].bv_page)
|
||||
__free_page(r1bio->bios[j]->bi_io_vec[i].bv_page);
|
||||
put_page(r1bio->bios[j]->bi_io_vec[i].bv_page);
|
||||
}
|
||||
for (i=0 ; i < pi->raid_disks; i++)
|
||||
bio_put(r1bio->bios[i]);
|
||||
@@ -384,7 +384,7 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
|
||||
/* free extra copy of the data pages */
|
||||
int i = bio->bi_vcnt;
|
||||
while (i--)
|
||||
__free_page(bio->bi_io_vec[i].bv_page);
|
||||
put_page(bio->bi_io_vec[i].bv_page);
|
||||
}
|
||||
/* clear the bitmap if all writes complete successfully */
|
||||
bitmap_endwrite(r1_bio->mddev->bitmap, r1_bio->sector,
|
||||
@@ -733,7 +733,7 @@ static struct page **alloc_behind_pages(struct bio *bio)
|
||||
do_sync_io:
|
||||
if (pages)
|
||||
for (i = 0; i < bio->bi_vcnt && pages[i]; i++)
|
||||
__free_page(pages[i]);
|
||||
put_page(pages[i]);
|
||||
kfree(pages);
|
||||
PRINTK("%dB behind alloc failed, doing sync I/O\n", bio->bi_size);
|
||||
return NULL;
|
||||
@@ -1893,7 +1893,7 @@ out_free_conf:
|
||||
if (conf->r1bio_pool)
|
||||
mempool_destroy(conf->r1bio_pool);
|
||||
kfree(conf->mirrors);
|
||||
__free_page(conf->tmppage);
|
||||
put_page(conf->tmppage);
|
||||
kfree(conf->poolinfo);
|
||||
kfree(conf);
|
||||
mddev->private = NULL;
|
||||
|
||||
Reference in New Issue
Block a user