git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ext4: missing !bh check in ext4_xattr_inode_write()
[sfrench/cifs-2.6.git]
/
fs
/
ext4
/
readpage.c
diff --git
a/fs/ext4/readpage.c
b/fs/ext4/readpage.c
index 19b87a8de6ff3659aaaa22dae4c32f73800f6777..f461d75ac049f04e2a180228530c507902269df0 100644
(file)
--- a/
fs/ext4/readpage.c
+++ b/
fs/ext4/readpage.c
@@
-98,7
+98,7
@@
static void mpage_end_io(struct bio *bio)
int ext4_mpage_readpages(struct address_space *mapping,
struct list_head *pages, struct page *page,
int ext4_mpage_readpages(struct address_space *mapping,
struct list_head *pages, struct page *page,
- unsigned nr_pages)
+ unsigned nr_pages
, bool is_readahead
)
{
struct bio *bio = NULL;
sector_t last_block_in_bio = 0;
{
struct bio *bio = NULL;
sector_t last_block_in_bio = 0;
@@
-259,7
+259,8
@@
int ext4_mpage_readpages(struct address_space *mapping,
bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9);
bio->bi_end_io = mpage_end_io;
bio->bi_private = ctx;
bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9);
bio->bi_end_io = mpage_end_io;
bio->bi_private = ctx;
- bio_set_op_attrs(bio, REQ_OP_READ, 0);
+ bio_set_op_attrs(bio, REQ_OP_READ,
+ is_readahead ? REQ_RAHEAD : 0);
}
length = first_hole << blkbits;
}
length = first_hole << blkbits;