aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-01-09 16:41:33 -0500
committerDarrick J. Wong <darrick.wong@oracle.com>2017-01-09 16:45:01 -0500
commit84a4620cfe97c9d57e39b2369bfb77faff55063d (patch)
tree4d64448c06bdf88721c6a01fd626386d73ea785e
parent12ef830198b0d71668eb9b59f9ba69d32951a48a (diff)
xfs: don't print warnings when xfs_log_force fails
There are only two reasons for xfs_log_force / xfs_log_force_lsn to fail: one is an I/O error, for which xlog_bdstrat already logs a warning, and the second is an already shutdown log due to a previous I/O errors. In the latter case we'll already have a previous indication for the actual error, but the large stream of misleading warnings from xfs_log_force will probably scroll it out of the message buffer. Simply removing the warnings thus makes the XFS log reporting significantly better. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
-rw-r--r--fs/xfs/xfs_log.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index c39ac14ff540..b1469f0a91a6 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3317,12 +3317,8 @@ xfs_log_force(
3317 xfs_mount_t *mp, 3317 xfs_mount_t *mp,
3318 uint flags) 3318 uint flags)
3319{ 3319{
3320 int error;
3321
3322 trace_xfs_log_force(mp, 0, _RET_IP_); 3320 trace_xfs_log_force(mp, 0, _RET_IP_);
3323 error = _xfs_log_force(mp, flags, NULL); 3321 _xfs_log_force(mp, flags, NULL);
3324 if (error)
3325 xfs_warn(mp, "%s: error %d returned.", __func__, error);
3326} 3322}
3327 3323
3328/* 3324/*
@@ -3466,12 +3462,8 @@ xfs_log_force_lsn(
3466 xfs_lsn_t lsn, 3462 xfs_lsn_t lsn,
3467 uint flags) 3463 uint flags)
3468{ 3464{
3469 int error;
3470
3471 trace_xfs_log_force(mp, lsn, _RET_IP_); 3465 trace_xfs_log_force(mp, lsn, _RET_IP_);
3472 error = _xfs_log_force_lsn(mp, lsn, flags, NULL); 3466 _xfs_log_force_lsn(mp, lsn, flags, NULL);
3473 if (error)
3474 xfs_warn(mp, "%s: error %d returned.", __func__, error);
3475} 3467}
3476 3468
3477/* 3469/*