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

Commit 8cbd9af9 authored by Jan Kara's avatar Jan Kara
Browse files

udf: Use dynamic debug infrastructure 



Instead of relying on UDFFS_DEBUG define for debug printing, just use
standard pr_debug() prints and rely on CONFIG_DYNAMIC_DEBUG
infrastructure for enabling or disabling prints.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent ab9a3a73

fs/udf/super.c

+0 −7
Original line number Diff line number Diff line
@@ -812,9 +812,7 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block) 
	struct buffer_head *bh;

	uint16_t ident;

	int ret = -ENOMEM;

#ifdef UDFFS_DEBUG

	struct timestamp *ts;

#endif



	outstr = kmalloc(128, GFP_NOFS);

	if (!outstr)
@@ -835,13 +833,10 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block) 


	udf_disk_stamp_to_time(&UDF_SB(sb)->s_record_time,

			      pvoldesc->recordingDateAndTime);

#ifdef UDFFS_DEBUG

	ts = &pvoldesc->recordingDateAndTime;

	udf_debug("recording time %04u/%02u/%02u %02u:%02u (%x)\n",

		  le16_to_cpu(ts->year), ts->month, ts->day, ts->hour,

		  ts->minute, le16_to_cpu(ts->typeAndTimezone));

#endif





	ret = udf_dstrCS0toChar(sb, outstr, 31, pvoldesc->volIdent, 32);

	if (ret < 0) {
@@ -1256,9 +1251,7 @@ static int udf_load_partdesc(struct super_block *sb, sector_t block) 
	 * PHYSICAL partitions are already set up

	 */

	type1_idx = i;

#ifdef UDFFS_DEBUG

	map = NULL; /* supress 'maybe used uninitialized' warning */

#endif

	for (i = 0; i < sbi->s_partitions; i++) {

		map = &sbi->s_partmaps[i];

fs/udf/udfdecl.h

+1 −9
Original line number Diff line number Diff line
@@ -31,16 +31,8 @@ extern __printf(3, 4) void _udf_warn(struct super_block *sb, 
#define udf_info(fmt, ...)					\

	pr_info("INFO " fmt, ##__VA_ARGS__)



#undef UDFFS_DEBUG



#ifdef UDFFS_DEBUG

#define udf_debug(fmt, ...)					\

	printk(KERN_DEBUG pr_fmt("%s:%d:%s: " fmt),		\

	       __FILE__, __LINE__, __func__, ##__VA_ARGS__)

#else

#define udf_debug(fmt, ...)					\

	no_printk(fmt, ##__VA_ARGS__)

#endif

	pr_debug("%s:%d:%s: " fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__)



#define udf_fixed_to_variable(x) ( ( ( (x) >> 5 ) * 39 ) + ( (x) & 0x0000001F ) )

#define udf_variable_to_fixed(x) ( ( ( (x) / 39 ) << 5 ) + ( (x) % 39 ) )