Browse Source

xfs: don't spray logs when dquot flush/purge fail

When dquot flush or purge fail there's no need to spam the logs, we've
already logged the IO error or fs shutdown that caused the flush
failures.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Darrick J. Wong 7 years ago
parent
commit
609001bca4
2 changed files with 3 additions and 12 deletions
  1. 1 4
      fs/xfs/xfs_dquot_item.c
  2. 2 8
      fs/xfs/xfs_qm.c

+ 1 - 4
fs/xfs/xfs_dquot_item.c

@@ -209,10 +209,7 @@ xfs_qm_dquot_logitem_push(
 	spin_unlock(&lip->li_ailp->ail_lock);
 	spin_unlock(&lip->li_ailp->ail_lock);
 
 
 	error = xfs_qm_dqflush(dqp, &bp);
 	error = xfs_qm_dqflush(dqp, &bp);
-	if (error) {
-		xfs_warn(dqp->q_mount, "%s: push error %d on dqp "PTR_FMT,
-			__func__, error, dqp);
-	} else {
+	if (!error) {
 		if (!xfs_buf_delwri_queue(bp, buffer_list))
 		if (!xfs_buf_delwri_queue(bp, buffer_list))
 			rval = XFS_ITEM_FLUSHING;
 			rval = XFS_ITEM_FLUSHING;
 		xfs_buf_relse(bp);
 		xfs_buf_relse(bp);

+ 2 - 8
fs/xfs/xfs_qm.c

@@ -161,10 +161,7 @@ xfs_qm_dqpurge(
 		 * to purge this dquot anyway, so we go ahead regardless.
 		 * to purge this dquot anyway, so we go ahead regardless.
 		 */
 		 */
 		error = xfs_qm_dqflush(dqp, &bp);
 		error = xfs_qm_dqflush(dqp, &bp);
-		if (error) {
-			xfs_warn(mp, "%s: dquot "PTR_FMT" flush failed",
-				__func__, dqp);
-		} else {
+		if (!error) {
 			error = xfs_bwrite(bp);
 			error = xfs_bwrite(bp);
 			xfs_buf_relse(bp);
 			xfs_buf_relse(bp);
 		}
 		}
@@ -479,11 +476,8 @@ xfs_qm_dquot_isolate(
 		spin_unlock(lru_lock);
 		spin_unlock(lru_lock);
 
 
 		error = xfs_qm_dqflush(dqp, &bp);
 		error = xfs_qm_dqflush(dqp, &bp);
-		if (error) {
-			xfs_warn(dqp->q_mount, "%s: dquot "PTR_FMT" flush failed",
-				 __func__, dqp);
+		if (error)
 			goto out_unlock_dirty;
 			goto out_unlock_dirty;
-		}
 
 
 		xfs_buf_delwri_queue(bp, &isol->buffers);
 		xfs_buf_delwri_queue(bp, &isol->buffers);
 		xfs_buf_relse(bp);
 		xfs_buf_relse(bp);