diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-02-12 22:08:01 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-20 21:29:37 -0400 |
| commit | 318ceed088497d1ca839b1172518ac4cc7096b82 (patch) | |
| tree | 7dfd07bfb5e8c5d5dbb0ba4ea523f334c98c66bb /drivers/oprofile | |
| parent | ca85c07809ca19de3391cb79ee1198f3dd91fa8d (diff) | |
| download | lwn-318ceed088497d1ca839b1172518ac4cc7096b82.tar.gz lwn-318ceed088497d1ca839b1172518ac4cc7096b82.zip | |
tidy up after d_make_root() conversion
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/oprofile')
| -rw-r--r-- | drivers/oprofile/oprofilefs.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c index 277bb70b8d75..ee8fd037bb53 100644 --- a/drivers/oprofile/oprofilefs.c +++ b/drivers/oprofile/oprofilefs.c @@ -238,7 +238,6 @@ struct dentry *oprofilefs_mkdir(struct super_block *sb, static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent) { struct inode *root_inode; - struct dentry *root_dentry; sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize_bits = PAGE_CACHE_SHIFT; @@ -251,13 +250,11 @@ static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent) return -ENOMEM; root_inode->i_op = &simple_dir_inode_operations; root_inode->i_fop = &simple_dir_operations; - root_dentry = d_make_root(root_inode); - if (!root_dentry) + sb->s_root = d_make_root(root_inode); + if (!sb->s_root) return -ENOMEM; - sb->s_root = root_dentry; - - oprofile_create_files(sb, root_dentry); + oprofile_create_files(sb, sb->s_root); // FIXME: verify kill_litter_super removes our dentries return 0; |