diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 10:00:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 10:00:14 -0700 |
| commit | 9a7259d5c8978bbeb5fdcf64b168f8470d8208a6 (patch) | |
| tree | 5c255d4b18622de06c2637c0c4069a384e99466d /fs/udf/super.c | |
| parent | e9c0f1529c9022afbab16a442382aa9a84a79c41 (diff) | |
| parent | e703c206135acb458adb705ec44bcc5d2615b37d (diff) | |
| download | linux-3.10-9a7259d5c8978bbeb5fdcf64b168f8470d8208a6.tar.gz linux-3.10-9a7259d5c8978bbeb5fdcf64b168f8470d8208a6.tar.bz2 linux-3.10-9a7259d5c8978bbeb5fdcf64b168f8470d8208a6.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext3, UDF, and quota fixes from Jan Kara:
"A couple of ext3 & UDF fixes and also one improvement in quota
locking."
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
ext3: fix start and len arguments handling in ext3_trim_fs()
udf: Fix deadlock in udf_release_file()
udf: Fix file entry logicalBlocksRecorded
udf: Fix handling of i_blocks
quota: Make quota code not call tty layer with dqptr_sem held
udf: Init/maintain file entry checkpoint field
ext3: Update ctime in ext3_splice_branch() only when needed
ext3: Don't call dquot_free_block() if we don't update anything
udf: Remove unnecessary OOM messages
Diffstat (limited to 'fs/udf/super.c')
| -rw-r--r-- | fs/udf/super.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 85067b4c7e1..ac8a348dcb6 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -950,11 +950,8 @@ static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index) else bitmap = vzalloc(size); /* TODO: get rid of vzalloc */ - if (bitmap == NULL) { - udf_err(sb, "Unable to allocate space for bitmap and %d buffer_head pointers\n", - nr_groups); + if (bitmap == NULL) return NULL; - } bitmap->s_block_bitmap = (struct buffer_head **)(bitmap + 1); bitmap->s_nr_groups = nr_groups; |