gfs2: Prepare to withdraw as soon as an IO error occurs in log write

Before this patch, function gfs2_end_log_write would detect any IO
errors writing to the journal and put out an appropriate message,
but it never set a withdrawing condition. Eventually, the log daemon
would see the error and determine it was time to withdraw, but in
the meantime, other processes could continue running as if nothing
bad ever happened. The biggest consequence is that __gfs2_glock_put
would BUG() when it saw that there were still unwritten items.

This patch sets the WITHDRAWING status as soon as an IO error is
detected, and that way, the BUG will be avoided so the file system
can be properly withdrawn and unmounted.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 0af2e5f..7307e5e 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -206,6 +206,9 @@ static void gfs2_end_log_write(struct bio *bio)
                if (!cmpxchg(&sdp->sd_log_error, 0, (int)bio->bi_status))
                        fs_err(sdp, "Error %d writing to journal, jid=%u\n",
                               bio->bi_status, sdp->sd_jdesc->jd_jid);
+               gfs2_withdraw_delayed(sdp);
+               /* prevent more writes to the journal */
+               clear_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags);
                wake_up(&sdp->sd_logd_waitq);
        }