Skip to content

Commit

Permalink
efivarfs: efivarfs_fill_super() fix inode reference counts
Browse files Browse the repository at this point in the history
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: Andy Whitcroft <apw@canonical.com>
Acked-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
  • Loading branch information
Andy Whitcroft authored and Matt Fleming committed Oct 30, 2012
1 parent 45a937a commit 5c9b50a
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions drivers/firmware/efivars.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 5c9b50a

Please sign in to comment.