From 158d90106c8cfb99a53c3c96490920d12fc39f35 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 28 May 2012 17:49:54 -0400 Subject: [PATCH] --- yaml --- r: 309961 b: refs/heads/master c: 2cde417de013b2e5ae3007374d937e8c4c426bd4 h: refs/heads/master i: 309959: f717ce63608c9f914487ba4c5cf27ca3549fa9df v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index faafe8f859af..b6b3eb812db7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2716b80284c5ca415b8ce93ca178b0ca28482568 +refs/heads/master: 2cde417de013b2e5ae3007374d937e8c4c426bd4 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 545932c0a290..628cfcdc0823 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -3527,6 +3527,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) GFP_KERNEL); if (sbi->s_group_desc == NULL) { ext4_msg(sb, KERN_ERR, "not enough memory"); + ret = -ENOMEM; goto failed_mount; } @@ -3584,6 +3585,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) } if (err) { ext4_msg(sb, KERN_ERR, "insufficient memory"); + ret = err; goto failed_mount3; }