diff options
Diffstat (limited to 'fs/udf/balloc.c')
-rw-r--r-- | fs/udf/balloc.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index 95518a9f589e..987585bb0a1d 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c | |||
@@ -59,8 +59,8 @@ static int __load_block_bitmap(struct super_block *sb, | |||
59 | int nr_groups = bitmap->s_nr_groups; | 59 | int nr_groups = bitmap->s_nr_groups; |
60 | 60 | ||
61 | if (block_group >= nr_groups) { | 61 | if (block_group >= nr_groups) { |
62 | udf_debug("block_group (%d) > nr_groups (%d)\n", block_group, | 62 | udf_debug("block_group (%d) > nr_groups (%d)\n", |
63 | nr_groups); | 63 | block_group, nr_groups); |
64 | } | 64 | } |
65 | 65 | ||
66 | if (bitmap->s_block_bitmap[block_group]) { | 66 | if (bitmap->s_block_bitmap[block_group]) { |
@@ -126,8 +126,9 @@ static void udf_bitmap_free_blocks(struct super_block *sb, | |||
126 | if (bloc->logicalBlockNum + count < count || | 126 | if (bloc->logicalBlockNum + count < count || |
127 | (bloc->logicalBlockNum + count) > partmap->s_partition_len) { | 127 | (bloc->logicalBlockNum + count) > partmap->s_partition_len) { |
128 | udf_debug("%d < %d || %d + %d > %d\n", | 128 | udf_debug("%d < %d || %d + %d > %d\n", |
129 | bloc->logicalBlockNum, 0, bloc->logicalBlockNum, | 129 | bloc->logicalBlockNum, 0, |
130 | count, partmap->s_partition_len); | 130 | bloc->logicalBlockNum, count, |
131 | partmap->s_partition_len); | ||
131 | goto error_return; | 132 | goto error_return; |
132 | } | 133 | } |
133 | 134 | ||
@@ -155,7 +156,7 @@ static void udf_bitmap_free_blocks(struct super_block *sb, | |||
155 | if (udf_set_bit(bit + i, bh->b_data)) { | 156 | if (udf_set_bit(bit + i, bh->b_data)) { |
156 | udf_debug("bit %ld already set\n", bit + i); | 157 | udf_debug("bit %ld already set\n", bit + i); |
157 | udf_debug("byte=%2x\n", | 158 | udf_debug("byte=%2x\n", |
158 | ((char *)bh->b_data)[(bit + i) >> 3]); | 159 | ((char *)bh->b_data)[(bit + i) >> 3]); |
159 | } | 160 | } |
160 | } | 161 | } |
161 | udf_add_free_space(sb, sbi->s_partition, count); | 162 | udf_add_free_space(sb, sbi->s_partition, count); |
@@ -369,7 +370,8 @@ static void udf_table_free_blocks(struct super_block *sb, | |||
369 | if (bloc->logicalBlockNum + count < count || | 370 | if (bloc->logicalBlockNum + count < count || |
370 | (bloc->logicalBlockNum + count) > partmap->s_partition_len) { | 371 | (bloc->logicalBlockNum + count) > partmap->s_partition_len) { |
371 | udf_debug("%d < %d || %d + %d > %d\n", | 372 | udf_debug("%d < %d || %d + %d > %d\n", |
372 | bloc->logicalBlockNum, 0, bloc->logicalBlockNum, count, | 373 | bloc->logicalBlockNum, 0, |
374 | bloc->logicalBlockNum, count, | ||
373 | partmap->s_partition_len); | 375 | partmap->s_partition_len); |
374 | goto error_return; | 376 | goto error_return; |
375 | } | 377 | } |