diff options
| -rw-r--r-- | fs/mpage.c | 13 | ||||
| -rw-r--r-- | include/linux/mpage.h | 10 |
2 files changed, 9 insertions, 14 deletions
diff --git a/fs/mpage.c b/fs/mpage.c index 16c3ef37eae3..680ba60863ff 100644 --- a/fs/mpage.c +++ b/fs/mpage.c | |||
| @@ -82,7 +82,7 @@ static void mpage_end_io_write(struct bio *bio, int err) | |||
| 82 | bio_put(bio); | 82 | bio_put(bio); |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | struct bio *mpage_bio_submit(int rw, struct bio *bio) | 85 | static struct bio *mpage_bio_submit(int rw, struct bio *bio) |
| 86 | { | 86 | { |
| 87 | bio->bi_end_io = mpage_end_io_read; | 87 | bio->bi_end_io = mpage_end_io_read; |
| 88 | if (rw == WRITE) | 88 | if (rw == WRITE) |
| @@ -90,7 +90,6 @@ struct bio *mpage_bio_submit(int rw, struct bio *bio) | |||
| 90 | submit_bio(rw, bio); | 90 | submit_bio(rw, bio); |
| 91 | return NULL; | 91 | return NULL; |
| 92 | } | 92 | } |
| 93 | EXPORT_SYMBOL(mpage_bio_submit); | ||
| 94 | 93 | ||
| 95 | static struct bio * | 94 | static struct bio * |
| 96 | mpage_alloc(struct block_device *bdev, | 95 | mpage_alloc(struct block_device *bdev, |
| @@ -439,7 +438,14 @@ EXPORT_SYMBOL(mpage_readpage); | |||
| 439 | * just allocate full-size (16-page) BIOs. | 438 | * just allocate full-size (16-page) BIOs. |
| 440 | */ | 439 | */ |
| 441 | 440 | ||
| 442 | int __mpage_writepage(struct page *page, struct writeback_control *wbc, | 441 | struct mpage_data { |
| 442 | struct bio *bio; | ||
| 443 | sector_t last_block_in_bio; | ||
| 444 | get_block_t *get_block; | ||
| 445 | unsigned use_writepage; | ||
| 446 | }; | ||
| 447 | |||
| 448 | static int __mpage_writepage(struct page *page, struct writeback_control *wbc, | ||
| 443 | void *data) | 449 | void *data) |
| 444 | { | 450 | { |
| 445 | struct mpage_data *mpd = data; | 451 | struct mpage_data *mpd = data; |
| @@ -648,7 +654,6 @@ out: | |||
| 648 | mpd->bio = bio; | 654 | mpd->bio = bio; |
| 649 | return ret; | 655 | return ret; |
| 650 | } | 656 | } |
| 651 | EXPORT_SYMBOL(__mpage_writepage); | ||
| 652 | 657 | ||
| 653 | /** | 658 | /** |
| 654 | * mpage_writepages - walk the list of dirty pages of the given address space & writepage() all of them | 659 | * mpage_writepages - walk the list of dirty pages of the given address space & writepage() all of them |
diff --git a/include/linux/mpage.h b/include/linux/mpage.h index 5c42821da2d1..068a0c9946af 100644 --- a/include/linux/mpage.h +++ b/include/linux/mpage.h | |||
| @@ -11,21 +11,11 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #ifdef CONFIG_BLOCK | 12 | #ifdef CONFIG_BLOCK |
| 13 | 13 | ||
| 14 | struct mpage_data { | ||
| 15 | struct bio *bio; | ||
| 16 | sector_t last_block_in_bio; | ||
| 17 | get_block_t *get_block; | ||
| 18 | unsigned use_writepage; | ||
| 19 | }; | ||
| 20 | |||
| 21 | struct writeback_control; | 14 | struct writeback_control; |
| 22 | 15 | ||
| 23 | struct bio *mpage_bio_submit(int rw, struct bio *bio); | ||
| 24 | int mpage_readpages(struct address_space *mapping, struct list_head *pages, | 16 | int mpage_readpages(struct address_space *mapping, struct list_head *pages, |
| 25 | unsigned nr_pages, get_block_t get_block); | 17 | unsigned nr_pages, get_block_t get_block); |
| 26 | int mpage_readpage(struct page *page, get_block_t get_block); | 18 | int mpage_readpage(struct page *page, get_block_t get_block); |
| 27 | int __mpage_writepage(struct page *page, struct writeback_control *wbc, | ||
| 28 | void *data); | ||
| 29 | int mpage_writepages(struct address_space *mapping, | 19 | int mpage_writepages(struct address_space *mapping, |
| 30 | struct writeback_control *wbc, get_block_t get_block); | 20 | struct writeback_control *wbc, get_block_t get_block); |
| 31 | int mpage_writepage(struct page *page, get_block_t *get_block, | 21 | int mpage_writepage(struct page *page, get_block_t *get_block, |
