From 17f8814c7aba838ffabe5d27a6757a6c08b0a0ef Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 24 Jan 2013 23:24:54 -0500 Subject: [PATCH] --- yaml --- r: 359033 b: refs/heads/master c: 72ba74508b2857e71d65fc93f0d6b684492fc740 h: refs/heads/master i: 359031: caebd7da5e11c2a71ee2fbfdd111879f9f960016 v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 294913f97951..69695e4dd282 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aaddea812cb0a2dc38b55ba557b68999bc2f6203 +refs/heads/master: 72ba74508b2857e71d65fc93f0d6b684492fc740 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index c014edd12648..3ac306064b28 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -4009,7 +4009,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) !(sb->s_flags & MS_RDONLY)) { err = ext4_enable_quotas(sb); if (err) - goto failed_mount7; + goto failed_mount8; } #endif /* CONFIG_QUOTA */ @@ -4036,6 +4036,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) ext4_msg(sb, KERN_ERR, "VFS: Can't find ext4 filesystem"); goto failed_mount; +#ifdef CONFIG_QUOTA +failed_mount8: + kobject_del(&sbi->s_kobj); +#endif failed_mount7: ext4_unregister_li_request(sb); failed_mount6: @@ -5006,9 +5010,9 @@ static int ext4_enable_quotas(struct super_block *sb) DQUOT_USAGE_ENABLED); if (err) { ext4_warning(sb, - "Failed to enable quota (type=%d) " - "tracking. Please run e2fsck to fix.", - type); + "Failed to enable quota tracking " + "(type=%d, err=%d). Please run " + "e2fsck to fix.", type, err); return err; } }