Skip to contentSkip to conversation

fs: fix WARN on alloc_super() fail path

PATCH RESEND New Vladimir Davydov 1 participant 1 message Jan 6, 2014 VFS

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 fs: fix WARN on alloc_super() fail path

On fail path alloc_super() calls destroy_super(), which issues a warning if the sb's s_mounts list is not empty, in particular if it has not been initialized. That said s_mounts must be initialized in alloc_super() before any possible failure, but currently it is initialized close to the end of the function leading to a useless warning dumped to log if either percpu_counter_init() or list_lru_init() fails. Let's fix this.

---
 fs/super.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/super.c +2 -1
index e5f6c2c..cecd780 100644
@@ -166,6 +166,8 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
 	if (!s)
 		return NULL;
 
+	INIT_LIST_HEAD(&s->s_mounts);
+
 	if (security_sb_alloc(s))
 		goto fail;
 
@@ -188,7 +190,6 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
 	if (list_lru_init(&s->s_inode_lru))
 		goto fail;
 
-	INIT_LIST_HEAD(&s->s_mounts);
 	init_rwsem(&s->s_umount);
 	lockdep_set_class(&s->s_umount, &type->s_umount_key);
 	/*
Signature · 1 line
1.7.10.4