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

Commit b6574520 authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Portability changes: remove prdev, stick to one diagnostic 


interface.

SGI-PV: 953338
SGI-Modid: xfs-linux-melb:xfs-kern:26103a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 9c48876a

fs/xfs/support/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ cmn_err(register int level, char *fmt, ...) 
	va_start(ap, fmt);

	if (*fmt == '!') fp++;

	len = vsprintf(message, fp, ap);

	if (message[len-1] != '\n')

	if (level != CE_DEBUG && message[len-1] != '\n')

		strcat(message, "\n");

	printk("%s%s", err_level[level], message);

	va_end(ap);
@@ -68,7 +68,7 @@ icmn_err(register int level, char *fmt, va_list ap) 
		level = XFS_MAX_ERR_LEVEL;

	spin_lock_irqsave(&xfs_err_lock,flags);

	len = vsprintf(message, fmt, ap);

	if (message[len-1] != '\n')

	if (level != CE_DEBUG && message[len-1] != '\n')

		strcat(message, "\n");

	spin_unlock_irqrestore(&xfs_err_lock,flags);

	printk("%s%s", err_level[level], message);

fs/xfs/support/debug.h

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ extern void cmn_err(int, char *, ...) 
	__attribute__ ((format (printf, 2, 3)));

extern void assfail(char *expr, char *f, int l);



#define prdev(fmt,targ,args...) \

	printk("Device %s - " fmt "\n", XFS_BUFTARG_NAME(targ), ## args)



#define ASSERT_ALWAYS(expr)	\

	(unlikely((expr) != 0) ? (void)0 : assfail(#expr, __FILE__, __LINE__))

fs/xfs/xfs_buf_item.c

+3 −3
Original line number Diff line number Diff line
@@ -1030,9 +1030,9 @@ xfs_buf_iodone_callbacks( 
		if ((XFS_BUF_TARGET(bp) != lasttarg) ||

		    (time_after(jiffies, (lasttime + 5*HZ)))) {

			lasttime = jiffies;

			prdev("XFS write error in file system meta-data "

			cmn_err(CE_ALERT, "Device %s, XFS metadata write error"

					" block 0x%llx in %s",

			      XFS_BUF_TARGET(bp),

				XFS_BUFTARG_NAME(XFS_BUF_TARGET(bp)),

			      (__uint64_t)XFS_BUF_ADDR(bp), mp->m_fsname);

		}

		lasttarg = XFS_BUF_TARGET(bp);

fs/xfs/xfs_inode.c

+3 −2
Original line number Diff line number Diff line
@@ -352,8 +352,9 @@ xfs_itobp( 
		if (unlikely(XFS_TEST_ERROR(!di_ok, mp, XFS_ERRTAG_ITOBP_INOTOBP,

				 XFS_RANDOM_ITOBP_INOTOBP))) {

#ifdef DEBUG

			prdev("bad inode magic/vsn daddr %lld #%d (magic=%x)",

				mp->m_ddev_targp,

			cmn_err(CE_ALERT, "Device %s - bad inode magic/vsn "

					  "daddr %lld #%d (magic=%x)",

				XFS_BUFTARG_NAME(mp->m_ddev_targp),

				(unsigned long long)imap.im_blkno, i,

				INT_GET(dip->di_core.di_magic, ARCH_CONVERT));

#endif

fs/xfs/xfs_log_recover.c

+9 −9
Original line number Diff line number Diff line
@@ -193,14 +193,14 @@ xlog_header_check_dump( 
{

	int			b;



	printk("%s:  SB : uuid = ", __FUNCTION__);

	cmn_err(CE_DEBUG, "%s:  SB : uuid = ", __FUNCTION__);

	for (b = 0; b < 16; b++)

		printk("%02x",((unsigned char *)&mp->m_sb.sb_uuid)[b]);

	printk(", fmt = %d\n", XLOG_FMT);

	printk("    log : uuid = ");

		cmn_err(CE_DEBUG, "%02x", ((uchar_t *)&mp->m_sb.sb_uuid)[b]);

	cmn_err(CE_DEBUG, ", fmt = %d\n", XLOG_FMT);

	cmn_err(CE_DEBUG, "    log : uuid = ");

	for (b = 0; b < 16; b++)

		printk("%02x",((unsigned char *)&head->h_fs_uuid)[b]);

	printk(", fmt = %d\n", INT_GET(head->h_fmt, ARCH_CONVERT));

		cmn_err(CE_DEBUG, "%02x",((uchar_t *)&head->h_fs_uuid)[b]);

	cmn_err(CE_DEBUG, ", fmt = %d\n", INT_GET(head->h_fmt, ARCH_CONVERT));

}

#else

#define xlog_header_check_dump(mp, head)
@@ -3444,13 +3444,13 @@ xlog_unpack_data_checksum( 
	    if (rhead->h_chksum ||

		((log->l_flags & XLOG_CHKSUM_MISMATCH) == 0)) {

		    cmn_err(CE_DEBUG,

			"XFS: LogR chksum mismatch: was (0x%x) is (0x%x)",

			"XFS: LogR chksum mismatch: was (0x%x) is (0x%x)\n",

			    INT_GET(rhead->h_chksum, ARCH_CONVERT), chksum);

		    cmn_err(CE_DEBUG,

"XFS: Disregard message if filesystem was created with non-DEBUG kernel");

		    if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb)) {

			    cmn_err(CE_DEBUG,

				"XFS: LogR this is a LogV2 filesystem");

				"XFS: LogR this is a LogV2 filesystem\n");

		    }

		    log->l_flags |= XLOG_CHKSUM_MISMATCH;

	    }
@@ -3999,7 +3999,7 @@ xlog_recover_finish( 
		log->l_flags &= ~XLOG_RECOVERY_NEEDED;

	} else {

		cmn_err(CE_DEBUG,

			"!Ending clean XFS mount for filesystem: %s",

			"!Ending clean XFS mount for filesystem: %s\n",

			log->l_mp->m_fsname);

	}

	return 0;