diff --git a/[refs] b/[refs] index 3f1705eb85b3..14dfdf1867c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15c006a22f8e004afbce42a54c878162355f1587 +refs/heads/master: 0e376b1e3ccedee49cb8cc6b652fbc1e7c15eeef diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 0423e2e7f615..3ab798d00f02 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -5285,8 +5285,10 @@ static int __init ext4_init_fs(void) if (err) goto out6; ext4_kset = kset_create_and_add("ext4", NULL, fs_kobj); - if (!ext4_kset) + if (!ext4_kset) { + err = -ENOMEM; goto out5; + } ext4_proc_root = proc_mkdir("fs/ext4", NULL); err = ext4_init_feat_adverts();