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

Commit d4f3cc01 authored by Eric Sandeen's avatar Eric Sandeen Committed by Lachlan McIlroy
Browse files

[XFS] lose xfs_hex_dump in favor of print_hex_dump 



No need for xfs to have its own hex dumping routine now that the kernel
has one.

SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:29847a

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 91906a88

fs/xfs/support/debug.c

+6 −0
Original line number Diff line number Diff line
@@ -80,3 +80,9 @@ assfail(char *expr, char *file, int line) 
	printk("Assertion failed: %s, file: %s, line: %d\n", expr, file, line);

	BUG();

}



void

xfs_hex_dump(void *p, int length)

{

	print_hex_dump(KERN_ALERT, "", DUMP_PREFIX_OFFSET, 16, 1, p, length, 1);

}

fs/xfs/xfs_error.c

+0 −31
Original line number Diff line number Diff line
@@ -230,37 +230,6 @@ xfs_error_report( 
	}

}



STATIC void

xfs_hex_dump(void *p, int length)

{

	__uint8_t *uip = (__uint8_t*)p;

	int	i;

	char	sbuf[128], *s;



	s = sbuf;

	*s = '\0';

	for (i=0; i<length; i++, uip++) {

		if ((i % 16) == 0) {

			if (*s != '\0')

				cmn_err(CE_ALERT, "%s\n", sbuf);

			s = sbuf;

			sprintf(s, "0x%x: ", i);

			while( *s != '\0')

				s++;

		}

		sprintf(s, "%02x ", *uip);



		/*

		 * the kernel sprintf is a void; user sprintf returns

		 * the sprintf'ed string's length.  Find the new end-

		 * of-string

		 */

		while( *s != '\0')

			s++;

	}

	cmn_err(CE_ALERT, "%s\n", sbuf);

}



void

xfs_corruption_error(

	char		*tag,

fs/xfs/xfs_error.h

+2 −0
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ extern void xfs_cmn_err(int panic_tag, int level, struct xfs_mount *mp, 
/* PRINTFLIKE3 */

extern void xfs_fs_cmn_err(int level, struct xfs_mount *mp, char *fmt, ...);



extern void xfs_hex_dump(void *p, int length);



#define xfs_fs_repair_cmn_err(level, mp, fmt, args...) \

	xfs_fs_cmn_err(level, mp, fmt "  Unmount and run xfs_repair.", ## args)