From: Jens Axboe <axboe@kernel.dk>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: hannes@cmpxchg.org, jack@suse.cz, torvalds@linux-foundation.org,
Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 02/12] buffer: grow_dev_page() should use __GFP_NOFAIL for all cases
Date: Wed, 27 Sep 2017 14:13:49 -0600 [thread overview]
Message-ID: <1506543239-31470-3-git-send-email-axboe@kernel.dk> (raw)
In-Reply-To: <1506543239-31470-1-git-send-email-axboe@kernel.dk>
We currently it it for find_or_create_page(), which means that it
cannot fail. Ensure we also pass in 'retry == true' to
alloc_page_buffers(), which also ensure that it cannot fail.
After this, there are no failure cases in grow_dev_page() that
occur because of a failed memory allocation.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
fs/buffer.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/fs/buffer.c b/fs/buffer.c
index 1234ae343aef..3b60cd8456db 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -988,8 +988,6 @@ grow_dev_page(struct block_device *bdev, sector_t block,
gfp_mask |= __GFP_NOFAIL;
page = find_or_create_page(inode->i_mapping, index, gfp_mask);
- if (!page)
- return ret;
BUG_ON(!PageLocked(page));
@@ -1008,9 +1006,7 @@ grow_dev_page(struct block_device *bdev, sector_t block,
/*
* Allocate some buffers for this page
*/
- bh = alloc_page_buffers(page, size, false);
- if (!bh)
- goto failed;
+ bh = alloc_page_buffers(page, size, true);
/*
* Link the page to the buffers and initialise them. Take the
--
2.7.4
next prev parent reply other threads:[~2017-09-27 20:14 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-27 20:13 [PATCH 0/12 v3] Writeback improvements Jens Axboe
2017-09-27 20:13 ` [PATCH 01/12] buffer: have alloc_page_buffers() use __GFP_NOFAIL Jens Axboe
2017-09-28 14:08 ` Nikolay Borisov
2017-10-02 15:02 ` Jan Kara
2017-09-27 20:13 ` Jens Axboe [this message]
2017-09-28 14:11 ` [PATCH 02/12] buffer: grow_dev_page() should use __GFP_NOFAIL for all cases Nikolay Borisov
2017-09-28 18:12 ` Jens Axboe
2017-10-03 12:10 ` Jan Kara
2017-10-03 12:25 ` Jan Kara
2017-10-03 14:36 ` Jens Axboe
2017-10-03 15:52 ` Jan Kara
2017-09-27 20:13 ` [PATCH 03/12] buffer: eliminate the need to call free_more_memory() in __getblk_slow() Jens Axboe
2017-09-28 14:12 ` Nikolay Borisov
2017-10-03 12:22 ` Jan Kara
2017-09-27 20:13 ` [PATCH 04/12] fs: kill 'nr_pages' argument from wakeup_flusher_threads() Jens Axboe
2017-09-27 20:13 ` [PATCH 05/12] writeback: switch wakeup_flusher_threads() to cyclic writeback Jens Axboe
2017-10-03 12:43 ` Jan Kara
2017-09-27 20:13 ` [PATCH 06/12] writeback: provide a wakeup_flusher_threads_bdi() Jens Axboe
2017-09-27 20:13 ` [PATCH 07/12] writeback: pass in '0' for nr_pages writeback in laptop mode Jens Axboe
2017-09-27 20:13 ` [PATCH 08/12] writeback: make wb_start_writeback() static Jens Axboe
2017-09-27 20:13 ` [PATCH 09/12] writeback: move nr_pages == 0 logic to one location Jens Axboe
2017-09-27 20:13 ` [PATCH 10/12] writeback: only allow one inflight and pending full flush Jens Axboe
2017-09-28 21:41 ` Andrew Morton
2017-09-28 21:44 ` Linus Torvalds
2017-09-29 0:17 ` Jens Axboe
2017-09-29 5:21 ` Amir Goldstein
2017-10-03 16:06 ` Matthew Wilcox
2017-10-03 16:11 ` Jens Axboe
2017-10-03 17:03 ` Matthew Wilcox
2017-09-29 0:15 ` Jens Axboe
2017-09-27 20:13 ` [PATCH 11/12] writeback: make sync_inodes_sb() use range cyclic writeback Jens Axboe
2017-09-27 20:13 ` [PATCH 12/12] writeback: kill off ->range_cycle option Jens Axboe
2017-09-27 20:22 ` Jens Axboe
2017-09-28 13:19 ` [PATCH 0/12 v3] Writeback improvements John Stoffel
2017-09-28 13:39 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1506543239-31470-3-git-send-email-axboe@kernel.dk \
--to=axboe@kernel.dk \
--cc=hannes@cmpxchg.org \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox