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/misc | |
parent | ca85c07809ca19de3391cb79ee1198f3dd91fa8d (diff) |
tidy up after d_make_root() conversion
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/ibmasm/ibmasmfs.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c index 15f24f362208..1c034b80d408 100644 --- a/drivers/misc/ibmasm/ibmasmfs.c +++ b/drivers/misc/ibmasm/ibmasmfs.c | |||
@@ -87,7 +87,7 @@ | |||
87 | static LIST_HEAD(service_processors); | 87 | static LIST_HEAD(service_processors); |
88 | 88 | ||
89 | static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode); | 89 | static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode); |
90 | static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root); | 90 | static void ibmasmfs_create_files (struct super_block *sb); |
91 | static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent); | 91 | static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent); |
92 | 92 | ||
93 | 93 | ||
@@ -114,7 +114,6 @@ static struct file_system_type ibmasmfs_type = { | |||
114 | static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent) | 114 | static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent) |
115 | { | 115 | { |
116 | struct inode *root; | 116 | struct inode *root; |
117 | struct dentry *root_dentry; | ||
118 | 117 | ||
119 | sb->s_blocksize = PAGE_CACHE_SIZE; | 118 | sb->s_blocksize = PAGE_CACHE_SIZE; |
120 | sb->s_blocksize_bits = PAGE_CACHE_SHIFT; | 119 | sb->s_blocksize_bits = PAGE_CACHE_SHIFT; |
@@ -129,12 +128,11 @@ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent) | |||
129 | root->i_op = &simple_dir_inode_operations; | 128 | root->i_op = &simple_dir_inode_operations; |
130 | root->i_fop = ibmasmfs_dir_ops; | 129 | root->i_fop = ibmasmfs_dir_ops; |
131 | 130 | ||
132 | root_dentry = d_make_root(root); | 131 | sb->s_root = d_make_root(root); |
133 | if (!root_dentry) | 132 | if (!sb->s_root) |
134 | return -ENOMEM; | 133 | return -ENOMEM; |
135 | sb->s_root = root_dentry; | ||
136 | 134 | ||
137 | ibmasmfs_create_files(sb, root_dentry); | 135 | ibmasmfs_create_files(sb); |
138 | return 0; | 136 | return 0; |
139 | } | 137 | } |
140 | 138 | ||
@@ -610,7 +608,7 @@ static const struct file_operations remote_settings_fops = { | |||
610 | }; | 608 | }; |
611 | 609 | ||
612 | 610 | ||
613 | static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root) | 611 | static void ibmasmfs_create_files (struct super_block *sb) |
614 | { | 612 | { |
615 | struct list_head *entry; | 613 | struct list_head *entry; |
616 | struct service_processor *sp; | 614 | struct service_processor *sp; |
@@ -619,7 +617,7 @@ static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root) | |||
619 | struct dentry *dir; | 617 | struct dentry *dir; |
620 | struct dentry *remote_dir; | 618 | struct dentry *remote_dir; |
621 | sp = list_entry(entry, struct service_processor, node); | 619 | sp = list_entry(entry, struct service_processor, node); |
622 | dir = ibmasmfs_create_dir(sb, root, sp->dirname); | 620 | dir = ibmasmfs_create_dir(sb, sb->s_root, sp->dirname); |
623 | if (!dir) | 621 | if (!dir) |
624 | continue; | 622 | continue; |
625 | 623 | ||