1 files changed, 12 insertions, 3 deletions

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 639a32c3c9c1..2690e460f2ef 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -653,6 +653,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
         int db_count;
         int i, j;
         __le32 features;
+        int err;
 
         sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
         if (!sbi)
@@ -906,12 +907,20 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
         get_random_bytes(&sbi->s_next_generation, sizeof(u32));
         spin_lock_init(&sbi->s_next_gen_lock);
 
-        percpu_counter_init(&sbi->s_freeblocks_counter,
+        err = percpu_counter_init(&sbi->s_freeblocks_counter,
                                 ext2_count_free_blocks(sb));
-        percpu_counter_init(&sbi->s_freeinodes_counter,
+        if (!err) {
+                err = percpu_counter_init(&sbi->s_freeinodes_counter,
                                 ext2_count_free_inodes(sb));
-        percpu_counter_init(&sbi->s_dirs_counter,
+        }
+        if (!err) {
+                err = percpu_counter_init(&sbi->s_dirs_counter,
                                 ext2_count_dirs(sb));
+        }
+        if (err) {
+                printk(KERN_ERR "EXT2-fs: insufficient memory\n");
+                goto failed_mount3;
+        }
         /*
          * set up enough so that it can read an inode
          */