summaryrefslogtreecommitdiffstats
path: root/fs/udf/inode.c
diff options
context:
space:
mode:
authorSteve Magnani <steve.magnani@digidescorp.com>2017-10-12 09:48:41 -0400
committerJan Kara <jack@suse.cz>2017-10-17 06:00:58 -0400
commitfcbf7637e6647e00de04d4b2e05ece2484bb3062 (patch)
tree438535f802620428f7f42c6f44153b5fc5bfe29b /fs/udf/inode.c
parentb490bdd630cc43a5725e76c7c23f8a7e55551145 (diff)
udf: Fix signed/unsigned format specifiers
Fix problems noted in compilion with -Wformat=2 -Wformat-signedness. In particular, a mismatch between the signedness of a value and the signedness of its format specifier can result in unsigned values being printed as negative numbers, e.g.: Partition (0 type 1511) starts at physical 460, block length -1779968542 ...which occurs when mounting a large (> 1 TiB) UDF partition. Changes since V1: * Fixed additional issues noted in udf_bitmap_free_blocks(), udf_get_fileident(), udf_show_options() Signed-off-by: Steven J. Magnani <steve@digidescorp.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/inode.c')
-rw-r--r--fs/udf/inode.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 1d8324a99e37..7d2a95c9d670 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1278,14 +1278,14 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode)
1278 1278
1279reread: 1279reread:
1280 if (iloc->partitionReferenceNum >= sbi->s_partitions) { 1280 if (iloc->partitionReferenceNum >= sbi->s_partitions) {
1281 udf_debug("partition reference: %d > logical volume partitions: %d\n", 1281 udf_debug("partition reference: %u > logical volume partitions: %u\n",
1282 iloc->partitionReferenceNum, sbi->s_partitions); 1282 iloc->partitionReferenceNum, sbi->s_partitions);
1283 return -EIO; 1283 return -EIO;
1284 } 1284 }
1285 1285
1286 if (iloc->logicalBlockNum >= 1286 if (iloc->logicalBlockNum >=
1287 sbi->s_partmaps[iloc->partitionReferenceNum].s_partition_len) { 1287 sbi->s_partmaps[iloc->partitionReferenceNum].s_partition_len) {
1288 udf_debug("block=%d, partition=%d out of range\n", 1288 udf_debug("block=%u, partition=%u out of range\n",
1289 iloc->logicalBlockNum, iloc->partitionReferenceNum); 1289 iloc->logicalBlockNum, iloc->partitionReferenceNum);
1290 return -EIO; 1290 return -EIO;
1291 } 1291 }
@@ -1304,13 +1304,13 @@ reread:
1304 */ 1304 */
1305 bh = udf_read_ptagged(inode->i_sb, iloc, 0, &ident); 1305 bh = udf_read_ptagged(inode->i_sb, iloc, 0, &ident);
1306 if (!bh) { 1306 if (!bh) {
1307 udf_err(inode->i_sb, "(ino %ld) failed !bh\n", inode->i_ino); 1307 udf_err(inode->i_sb, "(ino %lu) failed !bh\n", inode->i_ino);
1308 return -EIO; 1308 return -EIO;
1309 } 1309 }
1310 1310
1311 if (ident != TAG_IDENT_FE && ident != TAG_IDENT_EFE && 1311 if (ident != TAG_IDENT_FE && ident != TAG_IDENT_EFE &&
1312 ident != TAG_IDENT_USE) { 1312 ident != TAG_IDENT_USE) {
1313 udf_err(inode->i_sb, "(ino %ld) failed ident=%d\n", 1313 udf_err(inode->i_sb, "(ino %lu) failed ident=%u\n",
1314 inode->i_ino, ident); 1314 inode->i_ino, ident);
1315 goto out; 1315 goto out;
1316 } 1316 }
@@ -1346,7 +1346,7 @@ reread:
1346 } 1346 }
1347 brelse(ibh); 1347 brelse(ibh);
1348 } else if (fe->icbTag.strategyType != cpu_to_le16(4)) { 1348 } else if (fe->icbTag.strategyType != cpu_to_le16(4)) {
1349 udf_err(inode->i_sb, "unsupported strategy type: %d\n", 1349 udf_err(inode->i_sb, "unsupported strategy type: %u\n",
1350 le16_to_cpu(fe->icbTag.strategyType)); 1350 le16_to_cpu(fe->icbTag.strategyType));
1351 goto out; 1351 goto out;
1352 } 1352 }
@@ -1547,7 +1547,7 @@ reread:
1547 udf_debug("METADATA BITMAP FILE-----\n"); 1547 udf_debug("METADATA BITMAP FILE-----\n");
1548 break; 1548 break;
1549 default: 1549 default:
1550 udf_err(inode->i_sb, "(ino %ld) failed unknown file type=%d\n", 1550 udf_err(inode->i_sb, "(ino %lu) failed unknown file type=%u\n",
1551 inode->i_ino, fe->icbTag.fileType); 1551 inode->i_ino, fe->icbTag.fileType);
1552 goto out; 1552 goto out;
1553 } 1553 }
@@ -2091,7 +2091,7 @@ int8_t udf_next_aext(struct inode *inode, struct extent_position *epos,
2091 block = udf_get_lb_pblock(inode->i_sb, &epos->block, 0); 2091 block = udf_get_lb_pblock(inode->i_sb, &epos->block, 0);
2092 epos->bh = udf_tread(inode->i_sb, block); 2092 epos->bh = udf_tread(inode->i_sb, block);
2093 if (!epos->bh) { 2093 if (!epos->bh) {
2094 udf_debug("reading block %d failed!\n", block); 2094 udf_debug("reading block %u failed!\n", block);
2095 return -1; 2095 return -1;
2096 } 2096 }
2097 } 2097 }
@@ -2146,7 +2146,7 @@ int8_t udf_current_aext(struct inode *inode, struct extent_position *epos,
2146 *elen = le32_to_cpu(lad->extLength) & UDF_EXTENT_LENGTH_MASK; 2146 *elen = le32_to_cpu(lad->extLength) & UDF_EXTENT_LENGTH_MASK;
2147 break; 2147 break;
2148 default: 2148 default:
2149 udf_debug("alloc_type = %d unsupported\n", iinfo->i_alloc_type); 2149 udf_debug("alloc_type = %u unsupported\n", iinfo->i_alloc_type);
2150 return -1; 2150 return -1;
2151 } 2151 }
2152 2152