diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-01-16 22:21:04 +0100 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-01-16 22:21:04 +0100 |
| commit | f652f6c5b7cfdf139f4155d78f397e99ae1c4acc (patch) | |
| tree | 71c6344688bf56ea6aaf18c586ab69ff4f077ade /fs/udf/balloc.c | |
| parent | [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event (diff) | |
| parent | [SCSI] target: Add LIO target core v4.0.0-rc6 (diff) | |
| download | linux-f652f6c5b7cfdf139f4155d78f397e99ae1c4acc.tar.xz linux-f652f6c5b7cfdf139f4155d78f397e99ae1c4acc.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 into for-linus
Diffstat (limited to 'fs/udf/balloc.c')
| -rw-r--r-- | fs/udf/balloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index b608efaa4cee..306ee39ef2c3 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c @@ -157,10 +157,9 @@ static void udf_bitmap_free_blocks(struct super_block *sb, udf_debug("bit %ld already set\n", bit + i); udf_debug("byte=%2x\n", ((char *)bh->b_data)[(bit + i) >> 3]); - } else { - udf_add_free_space(sb, sbi->s_partition, 1); } } + udf_add_free_space(sb, sbi->s_partition, count); mark_buffer_dirty(bh); if (overflow) { block += count; |