diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-24 12:44:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-24 12:44:19 -0700 |
| commit | 3d29cb17baec4988bc1505a43138848a670017a3 (patch) | |
| tree | f25fe70574c4f94f68aa9064e0b0e52e0dd74545 /fs/buffer.c | |
| parent | da5de55d1747a2ac1739005b1d81183a8c557639 (diff) | |
| parent | d205bde78fa53e1ce256b1f7f65ede9696d73ee5 (diff) | |
| download | linux-stable-3d29cb17baec4988bc1505a43138848a670017a3.tar.gz linux-stable-3d29cb17baec4988bc1505a43138848a670017a3.tar.bz2 linux-stable-3d29cb17baec4988bc1505a43138848a670017a3.zip | |
Merge tag 'block-5.7-2020-04-24' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A few fixes/changes that should go into this release:
- null_blk zoned fixes (Damien)
- blkdev_close() sync improvement (Douglas)
- Fix regression in blk-iocost that impacted (at least) systemtap
(Waiman)
- Comment fix, header removal (Zhiqiang, Jianpeng)"
* tag 'block-5.7-2020-04-24' of git://git.kernel.dk/linux-block:
null_blk: Cleanup zoned device initialization
null_blk: Fix zoned command handling
block: remove unused header
blk-iocost: Fix error on iocost_ioc_vrate_adj
bdev: Reduce time holding bd_mutex in sync in blkdev_close()
buffer: remove useless comment and WB_REASON_FREE_MORE_MEM, reason.
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 599a0bf7257b..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; |