diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 15:50:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 15:50:25 -0500 |
commit | 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32 (patch) | |
tree | 5d5920258fc8e3bafd16fddf5fb92f9ec0bb3cc1 /fs/udf/balloc.c | |
parent | 75b08038ceb62f3bd8935346679920f97c3cf9f6 (diff) | |
parent | 2c948b3f86e5f0327e2e57858600af6e6f0ae29a (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
udf: Avoid IO in udf_clear_inode
udf: Try harder when looking for VAT inode
udf: Fix compilation with UDFFS_DEBUG enabled
Diffstat (limited to 'fs/udf/balloc.c')
-rw-r--r-- | fs/udf/balloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index 1e068535b58b..82372e332f08 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c | |||
@@ -440,7 +440,7 @@ static void udf_table_free_blocks(struct super_block *sb, | |||
440 | (bloc->logicalBlockNum + count) > | 440 | (bloc->logicalBlockNum + count) > |
441 | partmap->s_partition_len) { | 441 | partmap->s_partition_len) { |
442 | udf_debug("%d < %d || %d + %d > %d\n", | 442 | udf_debug("%d < %d || %d + %d > %d\n", |
443 | bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, | 443 | bloc->logicalBlockNum, 0, bloc->logicalBlockNum, count, |
444 | partmap->s_partition_len); | 444 | partmap->s_partition_len); |
445 | goto error_return; | 445 | goto error_return; |
446 | } | 446 | } |