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

Commit 5c9b50ab authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Matt Fleming
Browse files

efivarfs: efivarfs_fill_super() fix inode reference counts 



When d_make_root() fails it will automatically drop the reference
on the root inode.  We should not be doing so as well.

Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
Acked-by: default avatarMatthew Garrett <mjg@redhat.com>
Acked-by: default avatarJeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 45a937a8

drivers/firmware/efivars.c

+4 −12
Original line number Diff line number Diff line
@@ -948,7 +948,6 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent) 
	struct dentry *root;

	struct efivar_entry *entry, *n;

	struct efivars *efivars = &__efivars;

	int err;



	efivarfs_sb = sb;
@@ -960,18 +959,14 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_time_gran         = 1;



	inode = efivarfs_get_inode(sb, NULL, S_IFDIR | 0755, 0);

	if (!inode) {

		err = -ENOMEM;

		goto fail;

	}

	if (!inode)

		return -ENOMEM;

	inode->i_op = &efivarfs_dir_inode_operations;



	root = d_make_root(inode);

	sb->s_root = root;

	if (!root) {

		err = -ENOMEM;

		goto fail;

	}

	if (!root)

		return -ENOMEM;



	list_for_each_entry_safe(entry, n, &efivars->list, list) {

		struct inode *inode;
@@ -1012,9 +1007,6 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent) 
	}



	return 0;

fail:

	iput(inode);

	return err;

}



static struct dentry *efivarfs_mount(struct file_system_type *fs_type,