summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSebastian Manciulea <manciuleas@yahoo.com>2008-04-14 17:13:01 +0200
committerJan Kara <jack@suse.cz>2008-04-17 14:29:48 +0200
commit706047a79725b585cf272fdefc234b31b6545c72 (patch)
tree24d3055bfc3d87c052f6cd1efd100834a23b82fe /fs
parentudf: Fix bug in VAT mapping code (diff)
downloadlinux-706047a79725b585cf272fdefc234b31b6545c72.tar.xz
linux-706047a79725b585cf272fdefc234b31b6545c72.zip
udf: Fix compilation warnings when UDF debug is on
Fix two compilation warnings (and actual bugs in message formatting) when UDF debugging is turned on. Signed-off-by: Sebastian Manciulea <manciuleas@yahoo.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/udf/super.c7
-rw-r--r--fs/udf/udfdecl.h2
2 files changed, 5 insertions, 4 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 8f02b30c22ef..6823733c0121 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -608,7 +608,8 @@ static int udf_vrs(struct super_block *sb, int silent)
sector += (sbi->s_session << sb->s_blocksize_bits);
udf_debug("Starting at sector %u (%ld byte sectors)\n",
- (sector >> sb->s_blocksize_bits), sb->s_blocksize);
+ (unsigned int)(sector >> sb->s_blocksize_bits),
+ sb->s_blocksize);
/* Process the sequence (if applicable) */
for (; !nsr02 && !nsr03; sector += sectorsize) {
/* Read a block */
@@ -1117,8 +1118,8 @@ static int udf_fill_partdesc_info(struct super_block *sb,
if (p->accessType == cpu_to_le32(PD_ACCESS_TYPE_OVERWRITABLE))
map->s_partition_flags |= UDF_PART_FLAG_OVERWRITABLE;
- udf_debug("Partition (%d:%d type %x) starts at physical %d, "
- "block length %d\n", partitionNumber, p_index,
+ udf_debug("Partition (%d type %x) starts at physical %d, "
+ "block length %d\n", p_index,
map->s_partition_type, map->s_partition_root,
map->s_partition_len);
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index 30f664ab0cd9..61897d312a2e 100644
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -16,7 +16,7 @@
#define UDF_PREALLOCATE
#define UDF_DEFAULT_PREALLOC_BLOCKS 8
-#undef UDFFS_DEBUG
+#define UDFFS_DEBUG
#ifdef UDFFS_DEBUG
#define udf_debug(f, a...) \