overlayfs: embed middle into overlay_readdir_data

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

overlayfs: embed middle into overlay_readdir_data
same story... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro
1 parent 49be4fb9cc
Showing 1 changed file with 5 additions and 7 deletions Side-by-side Diff
fs/overlayfs/readdir.c
@@ -38,7 +38,7 @@
 	bool is_merge;
 	struct rb_root root;
 	struct list_head *list;
-	struct list_head *middle;
+	struct list_head middle;
 	int count;
 	int err;
 };
  
@@ -139,13 +139,13 @@
  
 	p = ovl_cache_entry_find(&rdd->root, name, namelen);
 	if (p) {
-		list_move_tail(&p->l_node, rdd->middle);
+		list_move_tail(&p->l_node, &rdd->middle);
 	} else {
 		p = ovl_cache_entry_new(name, namelen, ino, d_type);
 		if (p == NULL)
 			rdd->err = -ENOMEM;
 		else
-			list_add_tail(&p->l_node, rdd->middle);
+			list_add_tail(&p->l_node, &rdd->middle);
 	}
  
 	return rdd->err;
@@ -277,7 +277,6 @@
 				      struct list_head *list)
 {
 	int err;
-	struct list_head middle;
 	struct ovl_readdir_data rdd = {
 		.ctx.actor = ovl_fill_merge,
 		.list = list,
  
@@ -301,11 +300,10 @@
 		 * Insert lowerpath entries before upperpath ones, this allows
 		 * offsets to be reasonably constant
 		 */
-		list_add(&middle, rdd.list);
-		rdd.middle = &middle;
+		list_add(&rdd.middle, rdd.list);
 		rdd.is_merge = true;
 		err = ovl_dir_read(lowerpath, &rdd);
-		list_del(&middle);
+		list_del(&rdd.middle);
 	}
 out:
 	return err;
...	...	@@ -38,7 +38,7 @@
38	38	bool is_merge;
39	39	struct rb_root root;
40	40	struct list_head *list;
41		- struct list_head *middle;
	41	+ struct list_head middle;
42	42	int count;
43	43	int err;
44	44	};
45	45
...	...	@@ -139,13 +139,13 @@
139	139
140	140	p = ovl_cache_entry_find(&rdd->root, name, namelen);
141	141	if (p) {
142		- list_move_tail(&p->l_node, rdd->middle);
	142	+ list_move_tail(&p->l_node, &rdd->middle);
143	143	} else {
144	144	p = ovl_cache_entry_new(name, namelen, ino, d_type);
145	145	if (p == NULL)
146	146	rdd->err = -ENOMEM;
147	147	else
148		- list_add_tail(&p->l_node, rdd->middle);
	148	+ list_add_tail(&p->l_node, &rdd->middle);
149	149	}
150	150
151	151	return rdd->err;
...	...	@@ -277,7 +277,6 @@
277	277	struct list_head *list)
278	278	{
279	279	int err;
280		- struct list_head middle;
281	280	struct ovl_readdir_data rdd = {
282	281	.ctx.actor = ovl_fill_merge,
283	282	.list = list,
284	283
...	...	@@ -301,11 +300,10 @@
301	300	* Insert lowerpath entries before upperpath ones, this allows
302	301	* offsets to be reasonably constant
303	302	*/
304		- list_add(&middle, rdd.list);
305		- rdd.middle = &middle;
	303	+ list_add(&rdd.middle, rdd.list);
306	304	rdd.is_merge = true;
307	305	err = ovl_dir_read(lowerpath, &rdd);
308		- list_del(&middle);
	306	+ list_del(&rdd.middle);
309	307	}
310	308	out:
311	309	return err;