projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[deliverable/linux.git]
/
fs
/
mpage.c
diff --git
a/fs/mpage.c
b/fs/mpage.c
index ca0244b69de8bad8939ebb904e8d90156a81773e..778a4ddef77a21844b08af82058d3b188371dc01 100644
(file)
--- a/
fs/mpage.c
+++ b/
fs/mpage.c
@@
-42,14
+42,14
@@
* status of that page is hard. See end_buffer_async_read() for the details.
* There is no point in duplicating all that complexity.
*/
* status of that page is hard. See end_buffer_async_read() for the details.
* There is no point in duplicating all that complexity.
*/
-static void mpage_end_io(struct bio *bio
, int err
)
+static void mpage_end_io(struct bio *bio)
{
struct bio_vec *bv;
int i;
bio_for_each_segment_all(bv, bio, i) {
struct page *page = bv->bv_page;
{
struct bio_vec *bv;
int i;
bio_for_each_segment_all(bv, bio, i) {
struct page *page = bv->bv_page;
- page_endio(page, bio_data_dir(bio),
er
r);
+ page_endio(page, bio_data_dir(bio),
bio->bi_erro
r);
}
bio_put(bio);
}
bio_put(bio);
@@
-277,7
+277,7
@@
alloc_new:
goto out;
}
bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9),
goto out;
}
bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9),
- min_t(int, nr_pages,
bio_get_nr_vecs(bdev)
),
+ min_t(int, nr_pages,
BIO_MAX_PAGES
),
GFP_KERNEL);
if (bio == NULL)
goto confused;
GFP_KERNEL);
if (bio == NULL)
goto confused;
@@
-602,7
+602,7
@@
alloc_new:
}
}
bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9),
}
}
bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9),
-
bio_get_nr_vecs(bdev)
, GFP_NOFS|__GFP_HIGH);
+
BIO_MAX_PAGES
, GFP_NOFS|__GFP_HIGH);
if (bio == NULL)
goto confused;
if (bio == NULL)
goto confused;
This page took
0.038329 seconds
and
5
git commands to generate.