Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 609001bc authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

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: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 7b6b50f5

fs/xfs/xfs_dquot_item.c

+1 −4
Original line number Diff line number Diff line
@@ -209,10 +209,7 @@ xfs_qm_dquot_logitem_push( 
	spin_unlock(&lip->li_ailp->ail_lock);



	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))

			rval = XFS_ITEM_FLUSHING;

		xfs_buf_relse(bp);

fs/xfs/xfs_qm.c

+2 −8
Original line number Diff line number Diff line
@@ -161,10 +161,7 @@ xfs_qm_dqpurge( 
		 * to purge this dquot anyway, so we go ahead regardless.

		 */

		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);

			xfs_buf_relse(bp);

		}
@@ -479,11 +476,8 @@ xfs_qm_dquot_isolate( 
		spin_unlock(lru_lock);



		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;

		}



		xfs_buf_delwri_queue(bp, &isol->buffers);

		xfs_buf_relse(bp);