summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-05-28 23:49:54 +0200
committerTheodore Ts'o <tytso@mit.edu>2012-05-28 23:49:54 +0200
commit2cde417de013b2e5ae3007374d937e8c4c426bd4 (patch)
treea103c97aca903c3b6bc6147f92c76b34fe28c90a
parentext4: remove redundundant "(char *) bh->b_data" casts (diff)
downloadlinux-2cde417de013b2e5ae3007374d937e8c4c426bd4.tar.xz
linux-2cde417de013b2e5ae3007374d937e8c4c426bd4.zip
ext4: return ENOMEM when mounts fail due to lack of memory
This is a port of the ext3 commit: 4569cd1b0d9 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 545932c0a290..628cfcdc0823 100644
--- a/fs/ext4/super.c
+++ b/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;
}