1 files changed, 5 insertions, 7 deletions

diff --git a/fs/udf/super.c b/fs/udf/super.c
index 28039923114b..99cb81d0077f 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -266,11 +266,8 @@ 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);
+        sbi->s_partmaps = kcalloc(count, sizeof(*sbi->s_partmaps), GFP_KERNEL);
         if (!sbi->s_partmaps) {
-                udf_err(sb, "Unable to allocate space for %d partition maps\n",
-                        count);
                 sbi->s_partitions = 0;
                 return -ENOMEM;
         }
@@ -324,7 +321,8 @@ static void udf_sb_free_partitions(struct super_block *sb)
 {
         struct udf_sb_info *sbi = UDF_SB(sb);
         int i;
-        if (sbi->s_partmaps == NULL)
+
+        if (!sbi->s_partmaps)
                 return;
         for (i = 0; i < sbi->s_partitions; i++)
                 udf_free_partition(&sbi->s_partmaps[i]);
@@ -1071,7 +1069,7 @@ 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)
+        if (!bitmap)
                 return NULL;
 
         bitmap->s_nr_groups = nr_groups;
@@ -2099,7 +2097,7 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
         uopt.fmode = UDF_INVALID_MODE;
         uopt.dmode = UDF_INVALID_MODE;
 
-        sbi = kzalloc(sizeof(struct udf_sb_info), GFP_KERNEL);
+        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
         if (!sbi)
                 return -ENOMEM;