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

Commit 9130090b authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: kill support/debug.[ch] 



The remaining functionality in debug.[ch] is effectively just assert
handling, conditional debug definitions and hex dumping. The hex
dumping and assert function can be moved into the new printk module,
while the rest can be moved into top-level header files. This allows
fs/xfs/support/debug.[ch] to be completely removed from the
codebase.

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 0b932ccc

fs/xfs/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -111,6 +111,4 @@ xfs-y += $(addprefix $(XFS_LINUX)/, \ 
				   xfs_xattr.o)



# Objects in support/

xfs-y				+= $(addprefix support/, \

				   debug.o \

				   uuid.o)
 
xfs-y				+= support/uuid.o

fs/xfs/linux-2.6/xfs_linux.h

+21 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <mrlock.h>

#include <time.h>



#include <support/debug.h>

#include <support/uuid.h>



#include <linux/semaphore.h>
@@ -281,4 +280,25 @@ static inline __uint64_t howmany_64(__uint64_t x, __uint32_t y) 
#define __arch_pack

#endif



#define ASSERT_ALWAYS(expr)	\

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



#ifndef DEBUG

#define ASSERT(expr)	((void)0)



#ifndef STATIC

# define STATIC static noinline

#endif



#else /* DEBUG */



#define ASSERT(expr)	\

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



#ifndef STATIC

# define STATIC noinline

#endif



#endif /* DEBUG */



#endif /* __XFS_LINUX__ */

fs/xfs/linux-2.6/xfs_message.c

+14 −0
Original line number Diff line number Diff line
@@ -117,3 +117,17 @@ xfs_alert_tag( 


	return r;

}



void

assfail(char *expr, char *file, int line)

{

	xfs_emerg(NULL, "Assertion failed: %s, file: %s, line: %d",

		expr, file, line);

	BUG();

}



void

xfs_hex_dump(void *p, int length)

{

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

}

fs/xfs/linux-2.6/xfs_message.h

+4 −0
Original line number Diff line number Diff line
@@ -31,4 +31,8 @@ extern int xfs_debug(const struct xfs_mount *mp, const char *fmt, ...) 
#define xfs_debug(mp, fmt, ...)	(0)

#endif



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



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



#endif	/* __XFS_MESSAGE_H */

fs/xfs/support/debug.c

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.

 * All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it would be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#include <xfs.h>

#include "debug.h"



void

assfail(char *expr, char *file, int line)

{

	printk(KERN_CRIT "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_ADDRESS, 16, 1, p, length, 1);

}