aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/oprofile
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-02-12 22:08:01 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-20 21:29:37 -0400
commit318ceed088497d1ca839b1172518ac4cc7096b82 (patch)
tree7dfd07bfb5e8c5d5dbb0ba4ea523f334c98c66bb /drivers/oprofile
parentca85c07809ca19de3391cb79ee1198f3dd91fa8d (diff)
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.c9
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,
238static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent) 238static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent)
239{ 239{
240 struct inode *root_inode; 240 struct inode *root_inode;
241 struct dentry *root_dentry;
242 241
243 sb->s_blocksize = PAGE_CACHE_SIZE; 242 sb->s_blocksize = PAGE_CACHE_SIZE;
244 sb->s_blocksize_bits = PAGE_CACHE_SHIFT; 243 sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -251,13 +250,11 @@ static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent)
251 return -ENOMEM; 250 return -ENOMEM;
252 root_inode->i_op = &simple_dir_inode_operations; 251 root_inode->i_op = &simple_dir_inode_operations;
253 root_inode->i_fop = &simple_dir_operations; 252 root_inode->i_fop = &simple_dir_operations;
254 root_dentry = d_make_root(root_inode); 253 sb->s_root = d_make_root(root_inode);
255 if (!root_dentry) 254 if (!sb->s_root)
256 return -ENOMEM; 255 return -ENOMEM;
257 256
258 sb->s_root = root_dentry; 257 oprofile_create_files(sb, sb->s_root);
259
260 oprofile_create_files(sb, root_dentry);
261 258
262 // FIXME: verify kill_litter_super removes our dentries 259 // FIXME: verify kill_litter_super removes our dentries
263 return 0; 260 return 0;