diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-06-08 10:14:49 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-06-08 10:14:49 -0700 |
| commit | 4263eb6880df8383fff0efb872278a99eb6142c8 (patch) | |
| tree | 67ab9bf228e4f5f341f9408e055180932b39fe06 /fs/buffer.c | |
| parent | 636338d7968e47c7f2e0b772a2a825ad932883fb (diff) | |
| parent | 8e326a8bdef3fb42b92bf2742e8405d9b9209367 (diff) | |
| download | linux-4263eb6880df8383fff0efb872278a99eb6142c8.tar.bz2 | |
Merge branch 'fixes-v5.7' into fixes
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index f73276d746bb..a60f60396cfa 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -967,7 +967,7 @@ grow_dev_page(struct block_device *bdev, sector_t block, struct page *page; struct buffer_head *bh; sector_t end_block; - int ret = 0; /* Will call free_more_memory() */ + int ret = 0; gfp_t gfp_mask; gfp_mask = mapping_gfp_constraint(inode->i_mapping, ~__GFP_FS) | gfp; @@ -1371,6 +1371,17 @@ void __breadahead(struct block_device *bdev, sector_t block, unsigned size) } EXPORT_SYMBOL(__breadahead); +void __breadahead_gfp(struct block_device *bdev, sector_t block, unsigned size, + gfp_t gfp) +{ + struct buffer_head *bh = __getblk_gfp(bdev, block, size, gfp); + if (likely(bh)) { + ll_rw_block(REQ_OP_READ, REQ_RAHEAD, 1, &bh); + brelse(bh); + } +} +EXPORT_SYMBOL(__breadahead_gfp); + /** * __bread_gfp() - reads a specified block and returns the bh * @bdev: the block_device to read from |