From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
The whole point of libxfs_buf_delwri_submit is to submit a bunch of
buffers for write and wait for the response. Unfortunately, while it
does mark the buffers dirty, it doesn't actually flush them and lets the
cache mru flusher do it. This is inconsistent with the kernel API,
which actually writes the buffers and returns any IO errors.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Reviewed-by: Allison Collins <allison.henderson@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
---
libxfs/rdwr.c | 3 ++-
mkfs/xfs_mkfs.c | 16 ++++++++++------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index e2d9d790..92281d58 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -1498,9 +1498,10 @@ xfs_buf_delwri_submit(
list_for_each_entry_safe(bp, n, buffer_list, b_list) {
list_del_init(&bp->b_list);
- error2 = libxfs_writebuf(bp, 0);
+ error2 = libxfs_writebufr(bp);
if (!error)
error = error2;
+ libxfs_putbuf(bp);
}
return error;
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index c506577c..0f84860f 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -3685,6 +3685,7 @@ main(
};
struct list_head buffer_list;
+ int error;
platform_uuid_generate(&cli.uuid);
progname = basename(argv[0]);
@@ -3885,16 +3886,19 @@ main(
if (agno % 16)
continue;
- if (libxfs_buf_delwri_submit(&buffer_list)) {
- fprintf(stderr, _("%s: writing AG headers failed\n"),
- progname);
+ error = -libxfs_buf_delwri_submit(&buffer_list);
+ if (error) {
+ fprintf(stderr,
+ _("%s: writing AG headers failed, err=%d\n"),
+ progname, error);
exit(1);
}
}
- if (libxfs_buf_delwri_submit(&buffer_list)) {
- fprintf(stderr, _("%s: writing AG headers failed\n"),
- progname);
+ error = -libxfs_buf_delwri_submit(&buffer_list);
+ if (error) {
+ fprintf(stderr, _("%s: writing AG headers failed, err=%d\n"),
+ progname, error);
exit(1);
}
