Whamcloud - gitweb
LU-3292 build: kernel update for 3.0.74-0.6.6 sles11sp2
[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / sles11sp2 / ext4-handle-cleanup-after-quota-failure.patch
1 From: Jeff Mahoney <jeffm@suse.com>
2 Subject: ext4: cleanup sbi->s_kobj after quota initialization failure
3
4 If ext4_enable_quotas fails, it jumps to failed_mount7, which doesn't
5 tear down the kobj. If the user tries to mount the file system again,
6 they'll get big scary WARN_ONs from sysfs.
7
8 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
9 ---
10  fs/ext4/super.c |    6 +++++-
11  1 file changed, 5 insertions(+), 1 deletion(-)
12
13 --- a/fs/ext4/super.c
14 +++ b/fs/ext4/super.c
15 @@ -3794,7 +3794,7 @@ no_journal:
16             !(sb->s_flags & MS_RDONLY)) {
17                 ret = ext4_enable_quotas(sb);
18                 if (ret)
19 -                       goto failed_mount7;
20 +                       goto failed_mount8;
21         }
22  #endif  /* CONFIG_QUOTA */
23  
24 @@ -3813,6 +3813,10 @@ cantfind_ext4:
25                 ext4_msg(sb, KERN_ERR, "VFS: Can't find ext4 filesystem");
26         goto failed_mount;
27  
28 +failed_mount8:
29 +       kobject_del(&sbi->s_kobj);
30 +       kobject_put(&sbi->s_kobj);
31 +       wait_for_completion(&sbi->s_kobj_unregister);
32  failed_mount7:
33         ext4_unregister_li_request(sb);
34  failed_mount6: