Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cce2c56e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

logfs: initialize superblock entries earlier 



In particular, s_freeing_list needs to be initialized early, since it is
used on some of the error paths when mounts fail.  The mapping inode,
for example, would be initialized and then free'd on an error path
before s_freeing_list was initialized, but the inode drop operation
needs the s_freeing_list to be set up.

Normally you'd never see this, because not only is logfs fairly rare,
but a successful mount will never have any issues.

Reported-by: default avatarwerner <w.landgraf@ru.ru>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 609cfda5

fs/logfs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -480,10 +480,6 @@ static int logfs_read_sb(struct super_block *sb, int read_only) 
			!read_only)

		return -EIO;



	mutex_init(&super->s_dirop_mutex);

	mutex_init(&super->s_object_alias_mutex);

	INIT_LIST_HEAD(&super->s_freeing_list);



	ret = logfs_init_rw(sb);

	if (ret)

		return ret;
@@ -601,6 +597,10 @@ static struct dentry *logfs_mount(struct file_system_type *type, int flags, 
	if (!super)

		return ERR_PTR(-ENOMEM);



	mutex_init(&super->s_dirop_mutex);

	mutex_init(&super->s_object_alias_mutex);

	INIT_LIST_HEAD(&super->s_freeing_list);



	if (!devname)

		err = logfs_get_sb_bdev(super, type, devname);

	else if (strncmp(devname, "mtd", 3))