projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
fs
/
mpage.c
diff --git
a/fs/mpage.c
b/fs/mpage.c
index 16c3ef37eae348ed97ad90229d427449699315a3..680ba60863ffb2dee0f81ffbda6974c419c79668 100644
(file)
--- a/
fs/mpage.c
+++ b/
fs/mpage.c
@@
-82,7
+82,7
@@
static void mpage_end_io_write(struct bio *bio, int err)
bio_put(bio);
}
bio_put(bio);
}
-struct bio *mpage_bio_submit(int rw, struct bio *bio)
+st
atic st
ruct bio *mpage_bio_submit(int rw, struct bio *bio)
{
bio->bi_end_io = mpage_end_io_read;
if (rw == WRITE)
{
bio->bi_end_io = mpage_end_io_read;
if (rw == WRITE)
@@
-90,7
+90,6
@@
struct bio *mpage_bio_submit(int rw, struct bio *bio)
submit_bio(rw, bio);
return NULL;
}
submit_bio(rw, bio);
return NULL;
}
-EXPORT_SYMBOL(mpage_bio_submit);
static struct bio *
mpage_alloc(struct block_device *bdev,
static struct bio *
mpage_alloc(struct block_device *bdev,
@@
-439,7
+438,14
@@
EXPORT_SYMBOL(mpage_readpage);
* just allocate full-size (16-page) BIOs.
*/
* just allocate full-size (16-page) BIOs.
*/
-int __mpage_writepage(struct page *page, struct writeback_control *wbc,
+struct mpage_data {
+ struct bio *bio;
+ sector_t last_block_in_bio;
+ get_block_t *get_block;
+ unsigned use_writepage;
+};
+
+static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
void *data)
{
struct mpage_data *mpd = data;
void *data)
{
struct mpage_data *mpd = data;
@@
-648,7
+654,6
@@
out:
mpd->bio = bio;
return ret;
}
mpd->bio = bio;
return ret;
}
-EXPORT_SYMBOL(__mpage_writepage);
/**
* mpage_writepages - walk the list of dirty pages of the given address space & writepage() all of them
/**
* mpage_writepages - walk the list of dirty pages of the given address space & writepage() all of them