gfs2: Only complain the first time an io error occurs in quota or log

Before this patch, all io errors received by the quota daemon or the
logd daemon would cause a complaint message to be issued, such as:

   gfs2: fsid=dm-13.0: Error 10 writing to journal, jid=0

This patch changes it so that the error message is only issued the
first time the error is encountered.

Also, before this patch function gfs2_end_log_write did not set the
sd_log_error value, so log errors would not cause the file system to
be withdrawn. This patch sets the error code so the file system is
properly withdrawn if an io error is encountered writing to the journal.

WARNING: This change in function breaks check xfstests generic/441
and causes it to fail: io errors writing to the log should cause a
file system to be withdrawn, and no further operations are tolerated.

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 c090d5ad3f221d750a7b1e55f1606313004b195d..0af2e5ff0d97ebbd95d0ae06e09256f8c06bc62b 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -203,8 +203,9 @@ static void gfs2_end_log_write(struct bio *bio)
        struct bvec_iter_all iter_all;
 
        if (bio->bi_status) {
-               fs_err(sdp, "Error %d writing to journal, jid=%u\n",
-                      bio->bi_status, sdp->sd_jdesc->jd_jid);
+               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);
                wake_up(&sdp->sd_logd_waitq);
        }
 

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index ca2194cfa38ecbbdc6ffa3ea7ca72f279c171053..dbe87b2b55af52d4e00e060252e1af99380d365a 100644 (file)
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1476,8 +1476,8 @@ static void quotad_error(struct gfs2_sbd *sdp, const char *msg, int error)
        if (error == 0 || error == -EROFS)
                return;
        if (!gfs2_withdrawn(sdp)) {
-               fs_err(sdp, "gfs2_quotad: %s error %d\n", msg, error);
-               cmpxchg(&sdp->sd_log_error, 0, error);
+               if (!cmpxchg(&sdp->sd_log_error, 0, error))
+                       fs_err(sdp, "gfs2_quotad: %s error %d\n", msg, error);
                wake_up(&sdp->sd_logd_waitq);
        }
 }