From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Cc: Dave Chinner <david@fromorbit.com>
Subject: [PATCH 10/11] xfs: retry allocations from xfs_buf_get_uncached as well
Date: Wed, 19 May 2021 21:08:59 +0200 [thread overview]
Message-ID: <20210519190900.320044-11-hch@lst.de> (raw)
In-Reply-To: <20210519190900.320044-1-hch@lst.de>
There is no good reason why xfs_buf_get_uncached should fail on the
first allocation failure, so make it behave the same as the normal
xfs_buf_get_map path.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_buf.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index b3519a43759235..a1295b5b6f0ca6 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -351,8 +351,7 @@ xfs_buf_alloc_slab(
static int
xfs_buf_alloc_pages(
struct xfs_buf *bp,
- xfs_buf_flags_t flags,
- bool fail_fast)
+ xfs_buf_flags_t flags)
{
gfp_t gfp_mask = __GFP_NOWARN;
int i;
@@ -384,7 +383,7 @@ xfs_buf_alloc_pages(
retry:
page = alloc_page(gfp_mask);
if (unlikely(!page)) {
- if (fail_fast) {
+ if (flags & XBF_READ_AHEAD) {
bp->b_page_count = i;
xfs_buf_free_pages(bp);
return -ENOMEM;
@@ -682,8 +681,7 @@ xfs_buf_get_map(
*/
if (BBTOB(new_bp->b_length) >= PAGE_SIZE ||
xfs_buf_alloc_slab(new_bp, flags) < 0) {
- error = xfs_buf_alloc_pages(new_bp, flags,
- flags & XBF_READ_AHEAD);
+ error = xfs_buf_alloc_pages(new_bp, flags);
if (error)
goto out_free_buf;
}
@@ -924,7 +922,7 @@ xfs_buf_get_uncached(
if (error)
goto fail;
- error = xfs_buf_alloc_pages(bp, flags, true);
+ error = xfs_buf_alloc_pages(bp, flags);
if (error)
goto fail_free_buf;
--
2.30.2
next prev parent reply other threads:[~2021-05-19 19:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 19:08 RFC: buffer cache backing page allocation cleanup Christoph Hellwig
2021-05-19 19:08 ` [PATCH 01/11] xfs: cleanup error handling in xfs_buf_get_map Christoph Hellwig
2021-05-20 23:43 ` Darrick J. Wong
2021-05-19 19:08 ` [PATCH 02/11] xfs: split xfs_buf_allocate_memory Christoph Hellwig
2021-05-19 22:36 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 03/11] xfs: remove ->b_offset handling for page backed buffers Christoph Hellwig
2021-05-19 22:27 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 04/11] xfs: cleanup _xfs_buf_get_pages Christoph Hellwig
2021-05-19 22:40 ` Dave Chinner
2021-05-20 5:23 ` Christoph Hellwig
2021-05-25 22:43 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 05/11] xfs: remove the xb_page_found stat counter in xfs_buf_alloc_pages Christoph Hellwig
2021-05-19 22:55 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 06/11] xfs: remove the size and nbytes variables " Christoph Hellwig
2021-05-19 22:56 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 07/11] xfs: simplify the b_page_count calculation Christoph Hellwig
2021-05-19 19:08 ` [PATCH 08/11] xfs: centralize page allocation and freeing for buffers Christoph Hellwig
2021-05-19 23:22 ` Dave Chinner
2021-05-20 5:35 ` Christoph Hellwig
2021-05-25 23:59 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 09/11] xfs: lift the buffer zeroing logic into xfs_buf_alloc_pages Christoph Hellwig
2021-05-19 19:08 ` Christoph Hellwig [this message]
2021-05-19 19:09 ` [PATCH 11/11] xfs: use alloc_pages_bulk_array() for buffers Christoph Hellwig
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=20210519190900.320044-11-hch@lst.de \
--to=hch@lst.de \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.