udf: convert UDF_SB_ALLOC_PARTMAPS macro to udf_sb_alloc_partition_maps function
- convert UDF_SB_ALLOC_PARTMAPS macro to udf_sb_alloc_partition_maps function - convert kmalloc + memset to kcalloc - check if kcalloc failed (partially) Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: Ben Fennema <bfennema@falcon.csc.calpoly.edu> Cc: Jan Kara <jack@suse.cz> Acked-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
6c79e987d6
commit
dc5d39be6d
|
@ -52,6 +52,7 @@
|
||||||
#include <linux/buffer_head.h>
|
#include <linux/buffer_head.h>
|
||||||
#include <linux/vfs.h>
|
#include <linux/vfs.h>
|
||||||
#include <linux/vmalloc.h>
|
#include <linux/vmalloc.h>
|
||||||
|
#include <linux/errno.h>
|
||||||
#include <asm/byteorder.h>
|
#include <asm/byteorder.h>
|
||||||
|
|
||||||
#include <linux/udf_fs.h>
|
#include <linux/udf_fs.h>
|
||||||
|
@ -226,6 +227,24 @@ static void __exit exit_udf_fs(void)
|
||||||
module_init(init_udf_fs)
|
module_init(init_udf_fs)
|
||||||
module_exit(exit_udf_fs)
|
module_exit(exit_udf_fs)
|
||||||
|
|
||||||
|
static int udf_sb_alloc_partition_maps(struct super_block *sb, u32 count)
|
||||||
|
{
|
||||||
|
struct udf_sb_info *sbi = UDF_SB(sb);
|
||||||
|
|
||||||
|
sbi->s_partmaps = kcalloc(count, sizeof(struct udf_part_map),
|
||||||
|
GFP_KERNEL);
|
||||||
|
if (!sbi->s_partmaps) {
|
||||||
|
udf_error(sb, __FUNCTION__,
|
||||||
|
"Unable to allocate space for %d partition maps",
|
||||||
|
count);
|
||||||
|
sbi->s_partitions = 0;
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
|
||||||
|
sbi->s_partitions = count;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* udf_parse_options
|
* udf_parse_options
|
||||||
*
|
*
|
||||||
|
@ -1037,7 +1056,9 @@ static int udf_load_logicalvol(struct super_block *sb, struct buffer_head *bh,
|
||||||
|
|
||||||
lvd = (struct logicalVolDesc *)bh->b_data;
|
lvd = (struct logicalVolDesc *)bh->b_data;
|
||||||
|
|
||||||
UDF_SB_ALLOC_PARTMAPS(sb, le32_to_cpu(lvd->numPartitionMaps));
|
i = udf_sb_alloc_partition_maps(sb, le32_to_cpu(lvd->numPartitionMaps));
|
||||||
|
if (i != 0)
|
||||||
|
return i;
|
||||||
|
|
||||||
for (i = 0, offset = 0;
|
for (i = 0, offset = 0;
|
||||||
i < sbi->s_partitions && offset < le32_to_cpu(lvd->mapTableLength);
|
i < sbi->s_partitions && offset < le32_to_cpu(lvd->mapTableLength);
|
||||||
|
@ -1242,7 +1263,7 @@ static int udf_process_sequence(struct super_block *sb, long block,
|
||||||
if (i == VDS_POS_PRIMARY_VOL_DESC) {
|
if (i == VDS_POS_PRIMARY_VOL_DESC) {
|
||||||
udf_load_pvoldesc(sb, bh);
|
udf_load_pvoldesc(sb, bh);
|
||||||
} else if (i == VDS_POS_LOGICAL_VOL_DESC) {
|
} else if (i == VDS_POS_LOGICAL_VOL_DESC) {
|
||||||
udf_load_logicalvol(sb, bh, fileset);
|
udf_load_logicalvol(sb, bh, fileset); /* TODO: check return value */
|
||||||
} else if (i == VDS_POS_PARTITION_DESC) {
|
} else if (i == VDS_POS_PARTITION_DESC) {
|
||||||
struct buffer_head *bh2 = NULL;
|
struct buffer_head *bh2 = NULL;
|
||||||
if (udf_load_partdesc(sb, bh)) {
|
if (udf_load_partdesc(sb, bh)) {
|
||||||
|
|
|
@ -43,19 +43,6 @@ static inline struct udf_sb_info *UDF_SB(struct super_block *sb)
|
||||||
|
|
||||||
struct logicalVolIntegrityDescImpUse *udf_sb_lvidiu(struct udf_sb_info *sbi);
|
struct logicalVolIntegrityDescImpUse *udf_sb_lvidiu(struct udf_sb_info *sbi);
|
||||||
|
|
||||||
#define UDF_SB_ALLOC_PARTMAPS(X,Y)\
|
|
||||||
{\
|
|
||||||
struct udf_sb_info *sbi = UDF_SB(X);\
|
|
||||||
sbi->s_partmaps = kmalloc(sizeof(struct udf_part_map) * Y, GFP_KERNEL);\
|
|
||||||
if (sbi->s_partmaps != NULL) {\
|
|
||||||
sbi->s_partitions = Y;\
|
|
||||||
memset(sbi->s_partmaps, 0x00, sizeof(struct udf_part_map) * Y);\
|
|
||||||
} else {\
|
|
||||||
sbi->s_partitions = 0;\
|
|
||||||
udf_error(X, __FUNCTION__, "Unable to allocate space for %d partition maps", Y);\
|
|
||||||
}\
|
|
||||||
}
|
|
||||||
|
|
||||||
#define UDF_SB_ALLOC_BITMAP(X,Y,Z)\
|
#define UDF_SB_ALLOC_BITMAP(X,Y,Z)\
|
||||||
{\
|
{\
|
||||||
struct udf_sb_info *sbi = UDF_SB(X);\
|
struct udf_sb_info *sbi = UDF_SB(X);\
|
||||||
|
|
Loading…
Reference in a new issue