Commit 0b932ccc authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: Convert remaining cmn_err() callers to new API 



Once converted, kill the remainder of the cmn_err() interface.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarAlex Elder <aelder@sgi.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 8221112b

fs/xfs/quota/xfs_dquot.c

+18 −16
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ xfs_qm_dqget( 
	if (xfs_do_dqerror) {

		if ((xfs_dqerror_target == mp->m_ddev_targp) &&

		    (xfs_dqreq_num++ % xfs_dqerror_mod) == 0) {

			cmn_err(CE_DEBUG, "Returning error in dqget");

			xfs_debug(mp, "Returning error in dqget");

			return (EIO);

		}

	}
@@ -1427,36 +1427,38 @@ xfs_qm_dqpurge( 
void

xfs_qm_dqprint(xfs_dquot_t *dqp)

{

	cmn_err(CE_DEBUG, "-----------KERNEL DQUOT----------------");

	cmn_err(CE_DEBUG, "---- dquotID =  %d",

	struct xfs_mount	*mp = dqp->q_mount;



	xfs_debug(mp, "-----------KERNEL DQUOT----------------");

	xfs_debug(mp, "---- dquotID =  %d",

		(int)be32_to_cpu(dqp->q_core.d_id));

	cmn_err(CE_DEBUG, "---- type    =  %s", DQFLAGTO_TYPESTR(dqp));

	cmn_err(CE_DEBUG, "---- fs      =  0x%p", dqp->q_mount);

	cmn_err(CE_DEBUG, "---- blkno   =  0x%x", (int) dqp->q_blkno);

	cmn_err(CE_DEBUG, "---- boffset =  0x%x", (int) dqp->q_bufoffset);

	cmn_err(CE_DEBUG, "---- blkhlimit =  %Lu (0x%x)",

	xfs_debug(mp, "---- type    =  %s", DQFLAGTO_TYPESTR(dqp));

	xfs_debug(mp, "---- fs      =  0x%p", dqp->q_mount);

	xfs_debug(mp, "---- blkno   =  0x%x", (int) dqp->q_blkno);

	xfs_debug(mp, "---- boffset =  0x%x", (int) dqp->q_bufoffset);

	xfs_debug(mp, "---- blkhlimit =  %Lu (0x%x)",

		be64_to_cpu(dqp->q_core.d_blk_hardlimit),

		(int)be64_to_cpu(dqp->q_core.d_blk_hardlimit));

	cmn_err(CE_DEBUG, "---- blkslimit =  %Lu (0x%x)",

	xfs_debug(mp, "---- blkslimit =  %Lu (0x%x)",

		be64_to_cpu(dqp->q_core.d_blk_softlimit),

		(int)be64_to_cpu(dqp->q_core.d_blk_softlimit));

	cmn_err(CE_DEBUG, "---- inohlimit =  %Lu (0x%x)",

	xfs_debug(mp, "---- inohlimit =  %Lu (0x%x)",

		be64_to_cpu(dqp->q_core.d_ino_hardlimit),

		(int)be64_to_cpu(dqp->q_core.d_ino_hardlimit));

	cmn_err(CE_DEBUG, "---- inoslimit =  %Lu (0x%x)",

	xfs_debug(mp, "---- inoslimit =  %Lu (0x%x)",

		be64_to_cpu(dqp->q_core.d_ino_softlimit),

		(int)be64_to_cpu(dqp->q_core.d_ino_softlimit));

	cmn_err(CE_DEBUG, "---- bcount  =  %Lu (0x%x)",

	xfs_debug(mp, "---- bcount  =  %Lu (0x%x)",

		be64_to_cpu(dqp->q_core.d_bcount),

		(int)be64_to_cpu(dqp->q_core.d_bcount));

	cmn_err(CE_DEBUG, "---- icount  =  %Lu (0x%x)",

	xfs_debug(mp, "---- icount  =  %Lu (0x%x)",

		be64_to_cpu(dqp->q_core.d_icount),

		(int)be64_to_cpu(dqp->q_core.d_icount));

	cmn_err(CE_DEBUG, "---- btimer  =  %d",

	xfs_debug(mp, "---- btimer  =  %d",

		(int)be32_to_cpu(dqp->q_core.d_btimer));

	cmn_err(CE_DEBUG, "---- itimer  =  %d",

	xfs_debug(mp, "---- itimer  =  %d",

		(int)be32_to_cpu(dqp->q_core.d_itimer));

	cmn_err(CE_DEBUG, "---------------------------");

	xfs_debug(mp, "---------------------------");

}

#endif

fs/xfs/quota/xfs_qm.c

+12 −15
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ xfs_qm_dquot_list_print( 
	int		i = 0;



	list_for_each_entry(dqp, &mp->m_quotainfo->qi_dqlist_lock, qi_mplist) {

		cmn_err(CE_DEBUG, "   %d. \"%d (%s)\"   "

		xfs_debug(mp, "   %d. \"%d (%s)\"   "

				  "bcnt = %lld, icnt = %lld, refs = %d",

			i++, be32_to_cpu(dqp->q_core.d_id),

			DQFLAGTO_TYPESTR(dqp),
@@ -205,7 +205,7 @@ xfs_qm_destroy( 
	list_for_each_entry_safe(dqp, n, &xqm->qm_dqfrlist, q_freelist) {

		xfs_dqlock(dqp);

#ifdef QUOTADEBUG

		cmn_err(CE_DEBUG, "FREELIST destroy 0x%p", dqp);

		xfs_debug(dqp->q_mount, "FREELIST destroy 0x%p", dqp);

#endif

		list_del_init(&dqp->q_freelist);

		xfs_Gqm->qm_dqfrlist_cnt--;
@@ -341,9 +341,7 @@ xfs_qm_mount_quotas( 
	 * quotas immediately.

	 */

	if (mp->m_sb.sb_rextents) {

		cmn_err(CE_NOTE,

			"Cannot turn on quotas for realtime filesystem %s",

			mp->m_fsname);

		xfs_notice(mp, "Cannot turn on quotas for realtime filesystem");

		mp->m_qflags = 0;

		goto write_changes;

	}
@@ -1668,7 +1666,7 @@ xfs_qm_quotacheck( 
	 */

	ASSERT(list_empty(&mp->m_quotainfo->qi_dqlist));



	cmn_err(CE_NOTE, "XFS quotacheck %s: Please wait.", mp->m_fsname);

	xfs_notice(mp, "Quotacheck needed: Please wait.");



	/*

	 * First we go thru all the dquots on disk, USR and GRP/PRJ, and reset
@@ -1746,9 +1744,9 @@ xfs_qm_quotacheck( 


 error_return:

	if (error) {

		cmn_err(CE_WARN, "XFS quotacheck %s: Unsuccessful (Error %d): "

			"Disabling quotas.",

			mp->m_fsname, error);

		xfs_warn(mp,

	"Quotacheck: Unsuccessful (Error %d): Disabling quotas.",

			error);

		/*

		 * We must turn off quotas.

		 */
@@ -1756,12 +1754,11 @@ xfs_qm_quotacheck( 
		ASSERT(xfs_Gqm != NULL);

		xfs_qm_destroy_quotainfo(mp);

		if (xfs_mount_reset_sbqflags(mp)) {

			cmn_err(CE_WARN, "XFS quotacheck %s: "

				"Failed to reset quota flags.", mp->m_fsname);

		}

	} else {

		cmn_err(CE_NOTE, "XFS quotacheck %s: Done.", mp->m_fsname);

			xfs_warn(mp,

				"Quotacheck: Failed to reset quota flags.");

		}

	} else

		xfs_notice(mp, "Quotacheck: Done.");

	return (error);

}
@@ -2107,7 +2104,7 @@ xfs_qm_write_sb_changes( 
	int		error;



#ifdef QUOTADEBUG

	cmn_err(CE_NOTE, "Writing superblock quota changes :%s", mp->m_fsname);

	xfs_notice(mp, "Writing superblock quota changes");

#endif

	tp = xfs_trans_alloc(mp, XFS_TRANS_QM_SBCHANGE);

	if ((error = xfs_trans_reserve(tp, 0,

fs/xfs/quota/xfs_qm_bhv.c

+1 −2
Original line number Diff line number Diff line
@@ -119,8 +119,7 @@ xfs_qm_newmount( 
	     (gquotaondisk && !XFS_IS_GQUOTA_ON(mp)) ||

	    (!gquotaondisk &&  XFS_IS_OQUOTA_ON(mp)))  &&

	    xfs_dev_is_read_only(mp, "changing quota state")) {

		cmn_err(CE_WARN,

			"XFS: please mount with%s%s%s%s.",

		xfs_warn(mp, "please mount with%s%s%s%s.",

			(!quotaondisk ? "out quota" : ""),

			(uquotaondisk ? " usrquota" : ""),

			(pquotaondisk ? " prjquota" : ""),

fs/xfs/quota/xfs_qm_syscalls.c

+31 −27
Original line number Diff line number Diff line
@@ -936,10 +936,11 @@ struct mutex qcheck_lock; 
#define DQTEST_LIST_PRINT(l, NXT, title) \

{ \

	  xfs_dqtest_t	*dqp; int i = 0;\

	  cmn_err(CE_DEBUG, "%s (#%d)", title, (int) (l)->qh_nelems); \

	  xfs_debug(NULL, "%s (#%d)", title, (int) (l)->qh_nelems); \

	  for (dqp = (xfs_dqtest_t *)(l)->qh_next; dqp != NULL; \

	       dqp = (xfs_dqtest_t *)dqp->NXT) { \

		cmn_err(CE_DEBUG, "  %d. \"%d (%s)\"  bcnt = %d, icnt = %d", \

		xfs_debug(dqp->q_mount,		\

			"  %d. \"%d (%s)\"  bcnt = %d, icnt = %d", \

			 ++i, dqp->d_id, DQFLAGTO_TYPESTR(dqp),	     \

			 dqp->d_bcount, dqp->d_icount); } \

}
@@ -963,16 +964,17 @@ xfs_qm_hashinsert(xfs_dqhash_t *h, xfs_dqtest_t *dqp) 
}

STATIC void

xfs_qm_dqtest_print(

	xfs_dqtest_t	*d)

	struct xfs_mount	*mp,

	struct dqtest		*d)

{

	cmn_err(CE_DEBUG, "-----------DQTEST DQUOT----------------");

	cmn_err(CE_DEBUG, "---- dquot ID = %d", d->d_id);

	cmn_err(CE_DEBUG, "---- fs       = 0x%p", d->q_mount);

	cmn_err(CE_DEBUG, "---- bcount   = %Lu (0x%x)",

	xfs_debug(mp, "-----------DQTEST DQUOT----------------");

	xfs_debug(mp, "---- dquot ID = %d", d->d_id);

	xfs_debug(mp, "---- fs       = 0x%p", d->q_mount);

	xfs_debug(mp, "---- bcount   = %Lu (0x%x)",

		d->d_bcount, (int)d->d_bcount);

	cmn_err(CE_DEBUG, "---- icount   = %Lu (0x%x)",

	xfs_debug(mp, "---- icount   = %Lu (0x%x)",

		d->d_icount, (int)d->d_icount);

	cmn_err(CE_DEBUG, "---------------------------");

	xfs_debug(mp, "---------------------------");

}



STATIC void
@@ -986,12 +988,14 @@ xfs_qm_dqtest_failed( 
{

	qmtest_nfails++;

	if (error)

		cmn_err(CE_DEBUG, "quotacheck failed id=%d, err=%d\nreason: %s",

		xfs_debug(dqp->q_mount,

			"quotacheck failed id=%d, err=%d\nreason: %s",

			d->d_id, error, reason);

	else

		cmn_err(CE_DEBUG, "quotacheck failed id=%d (%s) [%d != %d]",

		xfs_debug(dqp->q_mount,

			"quotacheck failed id=%d (%s) [%d != %d]",

			d->d_id, reason, (int)a, (int)b);

	xfs_qm_dqtest_print(d);

	xfs_qm_dqtest_print(dqp->q_mount, d);

	if (dqp)

		xfs_qm_dqprint(dqp);

}
@@ -1018,9 +1022,9 @@ xfs_dqtest_cmp2( 
	    be64_to_cpu(dqp->q_core.d_bcount) >=

	    be64_to_cpu(dqp->q_core.d_blk_softlimit)) {

		if (!dqp->q_core.d_btimer && dqp->q_core.d_id) {

			cmn_err(CE_DEBUG,

				"%d [%s] [0x%p] BLK TIMER NOT STARTED",

				d->d_id, DQFLAGTO_TYPESTR(d), d->q_mount);

			xfs_debug(dqp->q_mount,

				"%d [%s] BLK TIMER NOT STARTED",

				d->d_id, DQFLAGTO_TYPESTR(d));

			err++;

		}

	}
@@ -1028,16 +1032,16 @@ xfs_dqtest_cmp2( 
	    be64_to_cpu(dqp->q_core.d_icount) >=

	    be64_to_cpu(dqp->q_core.d_ino_softlimit)) {

		if (!dqp->q_core.d_itimer && dqp->q_core.d_id) {

			cmn_err(CE_DEBUG,

				"%d [%s] [0x%p] INO TIMER NOT STARTED",

				d->d_id, DQFLAGTO_TYPESTR(d), d->q_mount);

			xfs_debug(dqp->q_mount,

				"%d [%s] INO TIMER NOT STARTED",

				d->d_id, DQFLAGTO_TYPESTR(d));

			err++;

		}

	}

#ifdef QUOTADEBUG

	if (!err) {

		cmn_err(CE_DEBUG, "%d [%s] [0x%p] qchecked",

			d->d_id, DQFLAGTO_TYPESTR(d), d->q_mount);

		xfs_debug(dqp->q_mount, "%d [%s] qchecked",

			d->d_id, DQFLAGTO_TYPESTR(d));

	}

#endif

	return (err);
@@ -1220,12 +1224,12 @@ xfs_qm_internalqcheck( 
				 xfs_qm_internalqcheck_adjust,

				 0, NULL, &done);

		if (error) {

			cmn_err(CE_DEBUG, "Bulkstat returned error 0x%x", error);

			xfs_debug(mp, "Bulkstat returned error 0x%x", error);

			break;

		}

	} while (!done);



	cmn_err(CE_DEBUG, "Checking results against system dquots");

	xfs_debug(mp, "Checking results against system dquots");

	for (i = 0; i < qmtest_hashmask; i++) {

		xfs_dqtest_t	*d, *n;

		xfs_dqhash_t	*h;
@@ -1243,10 +1247,10 @@ xfs_qm_internalqcheck( 
	}



	if (qmtest_nfails) {

		cmn_err(CE_DEBUG, "******** quotacheck failed  ********");

		cmn_err(CE_DEBUG, "failures = %d", qmtest_nfails);

		xfs_debug(mp, "******** quotacheck failed  ********");

		xfs_debug(mp, "failures = %d", qmtest_nfails);

	} else {

		cmn_err(CE_DEBUG, "******** quotacheck successful! ********");

		xfs_debug(mp, "******** quotacheck successful! ********");

	}

	kmem_free(qmtest_udqtab);

	kmem_free(qmtest_gdqtab);

fs/xfs/quota/xfs_trans_dquot.c

+3 −2
Original line number Diff line number Diff line
@@ -643,8 +643,9 @@ xfs_trans_dqresv( 
	     (XFS_IS_OQUOTA_ENFORCED(dqp->q_mount) &&

	      (XFS_QM_ISPDQ(dqp) || XFS_QM_ISGDQ(dqp))))) {

#ifdef QUOTADEBUG

		cmn_err(CE_DEBUG, "BLK Res: nblks=%ld + resbcount=%Ld"

			  " > hardlimit=%Ld?", nblks, *resbcountp, hardlimit);

		xfs_debug(mp,

			"BLK Res: nblks=%ld + resbcount=%Ld > hardlimit=%Ld?",

			nblks, *resbcountp, hardlimit);

#endif

		if (nblks > 0) {

			/*