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
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user