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

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
...@@ -948,7 +948,6 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -948,7 +948,6 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent)
struct dentry *root; struct dentry *root;
struct efivar_entry *entry, *n; struct efivar_entry *entry, *n;
struct efivars *efivars = &__efivars; struct efivars *efivars = &__efivars;
int err;
efivarfs_sb = sb; efivarfs_sb = sb;
...@@ -960,18 +959,14 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -960,18 +959,14 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_time_gran = 1; sb->s_time_gran = 1;
inode = efivarfs_get_inode(sb, NULL, S_IFDIR | 0755, 0); inode = efivarfs_get_inode(sb, NULL, S_IFDIR | 0755, 0);
if (!inode) { if (!inode)
err = -ENOMEM; return -ENOMEM;
goto fail;
}
inode->i_op = &efivarfs_dir_inode_operations; inode->i_op = &efivarfs_dir_inode_operations;
root = d_make_root(inode); root = d_make_root(inode);
sb->s_root = root; sb->s_root = root;
if (!root) { if (!root)
err = -ENOMEM; return -ENOMEM;
goto fail;
}
list_for_each_entry_safe(entry, n, &efivars->list, list) { list_for_each_entry_safe(entry, n, &efivars->list, list) {
struct inode *inode; struct inode *inode;
...@@ -1012,9 +1007,6 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -1012,9 +1007,6 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent)
} }
return 0; return 0;
fail:
iput(inode);
return err;
} }
static struct dentry *efivarfs_mount(struct file_system_type *fs_type, static struct dentry *efivarfs_mount(struct file_system_type *fs_type,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment