diff options
| author |   Andrew Price <anprice@redhat.com> | 2025-04-23 16:35:28 +0100 |
|---|---|---|
| committer |   Andreas Gruenbacher <agruenba@redhat.com> | 2025-04-24 23:12:15 +0200 |
| commit | 0a828c3ab07d997c10a86615d3f4ac8e701745b0 (patch) | |
| tree | 1882a110922d83eb218a7ae8616c155eb57e6b7b | |
| parent | gfs2: deallocate inodes in gfs2_create_inode (diff) | |
| download | wireguard-linux-0a828c3ab07d997c10a86615d3f4ac8e701745b0.tar.xz wireguard-linux-0a828c3ab07d997c10a86615d3f4ac8e701745b0.zip | |
gfs2: Fix usage of bio->bi_status in gfs2_end_log_write
bio->bi_status is an index into the blk_errors array, not an errno. Its
__bitwise tag is cast away here, resulting in a sparse warning:
fs/gfs2/lops.c:207:22: warning: cast from restricted blk_status_t
We could either add __force to the cast and continue logging bi_status
in the error message, or we could look up the errno in the array and log
that. As sdp->sd_log_error is used as an errno in all other cases, look
up the errno here for consistency.
Signed-off-by: Andrew Price <anprice@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
| -rw-r--r-- | fs/gfs2/lops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index 0fd3b5ec7d8c..a1022635abc9 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c @@ -204,9 +204,11 @@ static void gfs2_end_log_write(struct bio *bio) struct bvec_iter_all iter_all; if (bio->bi_status) { - if (!cmpxchg(&sdp->sd_log_error, 0, (int)bio->bi_status)) + int err = blk_status_to_errno(bio->bi_status); + + if (!cmpxchg(&sdp->sd_log_error, 0, err)) fs_err(sdp, "Error %d writing to journal, jid=%u\n", - bio->bi_status, sdp->sd_jdesc->jd_jid); + err, sdp->sd_jdesc->jd_jid); gfs2_withdraw_delayed(sdp); /* prevent more writes to the journal */ clear_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags); |