tidy up after d_make_root() conversion

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

tidy up after d_make_root() conversion
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro
1 parent ca85c07809
Showing 6 changed files with 26 additions and 53 deletions Side-by-side Diff
drivers/misc/ibmasm/ibmasmfs.c
drivers/oprofile/oprofilefs.c
drivers/usb/core/inode.c
fs/pstore/inode.c
fs/ramfs/inode.c
mm/shmem.c
@@ -87,7 +87,7 @@
 static LIST_HEAD(service_processors);
  
 static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode);
-static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root);
+static void ibmasmfs_create_files (struct super_block *sb);
 static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent);
  
  
@@ -114,7 +114,6 @@
 static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent)
 {
 	struct inode *root;
-	struct dentry *root_dentry;
  
 	sb->s_blocksize = PAGE_CACHE_SIZE;
 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
  
  
@@ -129,12 +128,11 @@
 	root->i_op = &simple_dir_inode_operations;
 	root->i_fop = ibmasmfs_dir_ops;
  
-	root_dentry = d_make_root(root);
-	if (!root_dentry)
+	sb->s_root = d_make_root(root);
+	if (!sb->s_root)
 		return -ENOMEM;
-	sb->s_root = root_dentry;
  
-	ibmasmfs_create_files(sb, root_dentry);
+	ibmasmfs_create_files(sb);
 	return 0;
 }
  
@@ -610,7 +608,7 @@
 };
  
  
-static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root)
+static void ibmasmfs_create_files (struct super_block *sb)
 {
 	struct list_head *entry;
 	struct service_processor *sp;
@@ -619,7 +617,7 @@
 		struct dentry *dir;
 		struct dentry *remote_dir;
 		sp = list_entry(entry, struct service_processor, node);
-		dir = ibmasmfs_create_dir(sb, root, sp->dirname);
+		dir = ibmasmfs_create_dir(sb, sb->s_root, sp->dirname);
 		if (!dir)
 			continue;
  
@@ -238,7 +238,6 @@
 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 @@
 		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;
@@ -454,7 +454,6 @@
 static int usbfs_fill_super(struct super_block *sb, void *data, int silent)
 {
 	struct inode *inode;
-	struct dentry *root;
  
 	sb->s_blocksize = PAGE_CACHE_SIZE;
 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
  
@@ -462,12 +461,11 @@
 	sb->s_op = &usbfs_ops;
 	sb->s_time_gran = 1;
 	inode = usbfs_get_inode(sb, S_IFDIR | 0755, 0);
-	root = d_make_root(inode);
-	if (!root) {
+	sb->s_root = d_make_root(inode);
+	if (!sb->s_root) {
 		dbg("%s: could not get root dentry!",__func__);
 		return -ENOMEM;
 	}
-	sb->s_root = root;
 	return 0;
 }
  
@@ -278,9 +278,7 @@
  
 int pstore_fill_super(struct super_block *sb, void *data, int silent)
 {
-	struct inode *inode = NULL;
-	struct dentry *root;
-	int err;
+	struct inode *inode;
  
 	save_mount_options(sb, data);
  
  
  
  
@@ -296,25 +294,17 @@
 	parse_options(data);
  
 	inode = pstore_get_inode(sb, NULL, S_IFDIR | 0755, 0);
-	if (!inode) {
-		err = -ENOMEM;
-		goto fail;
+	if (inode) {
+		/* override ramfs "dir" options so we catch unlink(2) */
+		inode->i_op = &pstore_dir_inode_operations;
 	}
-	/* override ramfs "dir" options so we catch unlink(2) */
-	inode->i_op = &pstore_dir_inode_operations;
+	sb->s_root = d_make_root(inode);
+	if (!sb->s_root)
+		return -ENOMEM;
  
-	root = d_make_root(inode);
-	sb->s_root = root;
-	if (!root) {
-		err = -ENOMEM;
-		goto fail;
-	}
-
 	pstore_get_records(0);
  
 	return 0;
-fail:
-	return err;
 }
  
 static struct dentry *pstore_mount(struct file_system_type *fs_type,
@@ -209,21 +209,19 @@
 int ramfs_fill_super(struct super_block *sb, void *data, int silent)
 {
 	struct ramfs_fs_info *fsi;
-	struct inode *inode = NULL;
+	struct inode *inode;
 	int err;
  
 	save_mount_options(sb, data);
  
 	fsi = kzalloc(sizeof(struct ramfs_fs_info), GFP_KERNEL);
 	sb->s_fs_info = fsi;
-	if (!fsi) {
-		err = -ENOMEM;
-		goto fail;
-	}
+	if (!fsi)
+		return -ENOMEM;
  
 	err = ramfs_parse_options(data, &fsi->mount_opts);
 	if (err)
-		goto fail;
+		return err;
  
 	sb->s_maxbytes		= MAX_LFS_FILESIZE;
 	sb->s_blocksize		= PAGE_CACHE_SIZE;
  
@@ -234,16 +232,10 @@
  
 	inode = ramfs_get_inode(sb, NULL, S_IFDIR | fsi->mount_opts.mode, 0);
 	sb->s_root = d_make_root(inode);
-	if (!sb->s_root) {
-		err = -ENOMEM;
-		goto fail;
-	}
+	if (!sb->s_root)
+		return -ENOMEM;
  
 	return 0;
-fail:
-	kfree(fsi);
-	sb->s_fs_info = NULL;
-	return err;
 }
  
 struct dentry *ramfs_mount(struct file_system_type *fs_type,
@@ -2175,7 +2175,6 @@
 int shmem_fill_super(struct super_block *sb, void *data, int silent)
 {
 	struct inode *inode;
-	struct dentry *root;
 	struct shmem_sb_info *sbinfo;
 	int err = -ENOMEM;
  
  
@@ -2232,10 +2231,9 @@
 		goto failed;
 	inode->i_uid = sbinfo->uid;
 	inode->i_gid = sbinfo->gid;
-	root = d_make_root(inode);
-	if (!root)
+	sb->s_root = d_make_root(inode);
+	if (!sb->s_root)
 		goto failed;
-	sb->s_root = root;
 	return 0;
  
 failed:
...	...	@@ -87,7 +87,7 @@
87	87	static LIST_HEAD(service_processors);
88	88
89	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	91	static int ibmasmfs_fill_super (struct super_block sb, void data, int silent);
92	92
93	93
...	...	@@ -114,7 +114,6 @@
114	114	static int ibmasmfs_fill_super (struct super_block sb, void data, int silent)
115	115	{
116	116	struct inode *root;
117		- struct dentry *root_dentry;
118	117
119	118	sb->s_blocksize = PAGE_CACHE_SIZE;
120	119	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
121	120
122	121
...	...	@@ -129,12 +128,11 @@
129	128	root->i_op = &simple_dir_inode_operations;
130	129	root->i_fop = ibmasmfs_dir_ops;
131	130
132		- root_dentry = d_make_root(root);
133		- if (!root_dentry)
	131	+ sb->s_root = d_make_root(root);
	132	+ if (!sb->s_root)
134	133	return -ENOMEM;
135		- sb->s_root = root_dentry;
136	134
137		- ibmasmfs_create_files(sb, root_dentry);
	135	+ ibmasmfs_create_files(sb);
138	136	return 0;
139	137	}
140	138
...	...	@@ -610,7 +608,7 @@
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	613	struct list_head *entry;
616	614	struct service_processor *sp;
...	...	@@ -619,7 +617,7 @@
619	617	struct dentry *dir;
620	618	struct dentry *remote_dir;
621	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	621	if (!dir)
624	622	continue;
625	623
...	...	@@ -238,7 +238,6 @@
238	238	static int oprofilefs_fill_super(struct super_block sb, void data, int silent)
239	239	{
240	240	struct inode *root_inode;
241		- struct dentry *root_dentry;
242	241
243	242	sb->s_blocksize = PAGE_CACHE_SIZE;
244	243	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
245	244
...	...	@@ -251,13 +250,11 @@
251	250	return -ENOMEM;
252	251	root_inode->i_op = &simple_dir_inode_operations;
253	252	root_inode->i_fop = &simple_dir_operations;
254		- root_dentry = d_make_root(root_inode);
255		- if (!root_dentry)
	253	+ sb->s_root = d_make_root(root_inode);
	254	+ if (!sb->s_root)
256	255	return -ENOMEM;
257	256
258		- sb->s_root = root_dentry;
259		-
260		- oprofile_create_files(sb, root_dentry);
	257	+ oprofile_create_files(sb, sb->s_root);
261	258
262	259	// FIXME: verify kill_litter_super removes our dentries
263	260	return 0;
...	...	@@ -454,7 +454,6 @@
454	454	static int usbfs_fill_super(struct super_block sb, void data, int silent)
455	455	{
456	456	struct inode *inode;
457		- struct dentry *root;
458	457
459	458	sb->s_blocksize = PAGE_CACHE_SIZE;
460	459	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
461	460
...	...	@@ -462,12 +461,11 @@
462	461	sb->s_op = &usbfs_ops;
463	462	sb->s_time_gran = 1;
464	463	inode = usbfs_get_inode(sb, S_IFDIR \| 0755, 0);
465		- root = d_make_root(inode);
466		- if (!root) {
	464	+ sb->s_root = d_make_root(inode);
	465	+ if (!sb->s_root) {
467	466	dbg("%s: could not get root dentry!",__func__);
468	467	return -ENOMEM;
469	468	}
470		- sb->s_root = root;
471	469	return 0;
472	470	}
473	471
...	...	@@ -278,9 +278,7 @@
278	278
279	279	int pstore_fill_super(struct super_block sb, void data, int silent)
280	280	{
281		- struct inode *inode = NULL;
282		- struct dentry *root;
283		- int err;
	281	+ struct inode *inode;
284	282
285	283	save_mount_options(sb, data);
286	284
287	285
288	286
289	287
...	...	@@ -296,25 +294,17 @@
296	294	parse_options(data);
297	295
298	296	inode = pstore_get_inode(sb, NULL, S_IFDIR \| 0755, 0);
299		- if (!inode) {
300		- err = -ENOMEM;
301		- goto fail;
	297	+ if (inode) {
	298	+ /* override ramfs "dir" options so we catch unlink(2) */
	299	+ inode->i_op = &pstore_dir_inode_operations;
302	300	}
303		- /* override ramfs "dir" options so we catch unlink(2) */
304		- inode->i_op = &pstore_dir_inode_operations;
	301	+ sb->s_root = d_make_root(inode);
	302	+ if (!sb->s_root)
	303	+ return -ENOMEM;
305	304
306		- root = d_make_root(inode);
307		- sb->s_root = root;
308		- if (!root) {
309		- err = -ENOMEM;
310		- goto fail;
311		- }
312		-
313	305	pstore_get_records(0);
314	306
315	307	return 0;
316		-fail:
317		- return err;
318	308	}
319	309
320	310	static struct dentry pstore_mount(struct file_system_type fs_type,
...	...	@@ -209,21 +209,19 @@
209	209	int ramfs_fill_super(struct super_block sb, void data, int silent)
210	210	{
211	211	struct ramfs_fs_info *fsi;
212		- struct inode *inode = NULL;
	212	+ struct inode *inode;
213	213	int err;
214	214
215	215	save_mount_options(sb, data);
216	216
217	217	fsi = kzalloc(sizeof(struct ramfs_fs_info), GFP_KERNEL);
218	218	sb->s_fs_info = fsi;
219		- if (!fsi) {
220		- err = -ENOMEM;
221		- goto fail;
222		- }
	219	+ if (!fsi)
	220	+ return -ENOMEM;
223	221
224	222	err = ramfs_parse_options(data, &fsi->mount_opts);
225	223	if (err)
226		- goto fail;
	224	+ return err;
227	225
228	226	sb->s_maxbytes = MAX_LFS_FILESIZE;
229	227	sb->s_blocksize = PAGE_CACHE_SIZE;
230	228
...	...	@@ -234,16 +232,10 @@
234	232
235	233	inode = ramfs_get_inode(sb, NULL, S_IFDIR \| fsi->mount_opts.mode, 0);
236	234	sb->s_root = d_make_root(inode);
237		- if (!sb->s_root) {
238		- err = -ENOMEM;
239		- goto fail;
240		- }
	235	+ if (!sb->s_root)
	236	+ return -ENOMEM;
241	237
242	238	return 0;
243		-fail:
244		- kfree(fsi);
245		- sb->s_fs_info = NULL;
246		- return err;
247	239	}
248	240
249	241	struct dentry ramfs_mount(struct file_system_type fs_type,
...	...	@@ -2175,7 +2175,6 @@
2175	2175	int shmem_fill_super(struct super_block sb, void data, int silent)
2176	2176	{
2177	2177	struct inode *inode;
2178		- struct dentry *root;
2179	2178	struct shmem_sb_info *sbinfo;
2180	2179	int err = -ENOMEM;
2181	2180
2182	2181
...	...	@@ -2232,10 +2231,9 @@
2232	2231	goto failed;
2233	2232	inode->i_uid = sbinfo->uid;
2234	2233	inode->i_gid = sbinfo->gid;
2235		- root = d_make_root(inode);
2236		- if (!root)
	2234	+ sb->s_root = d_make_root(inode);
	2235	+ if (!sb->s_root)
2237	2236	goto failed;
2238		- sb->s_root = root;
2239	2237	return 0;
2240	2238
2241	2239	failed: