UBI: factorize destroy_av() and ubi_remove_av() code

Boris Brezillon · richardweinberger · commit f9efe8d8a5d5 · 2016-10-02T22:48:14.000+02:00
Those functions are pretty much doing the same thing, except
ubi_remove_av() is putting the aeb elements attached to the volume into
the ai-&gt;erase list and the destroy_av() is freeing them.

Rework destroy_av() to handle both cases.

Signed-off-by: Boris Brezillon &lt;boris.brezillon@free-electrons.com&gt;
Signed-off-by: Richard Weinberger &lt;richard@nod.at&gt;
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
@@ -722,26 +722,20 @@ struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai,
 			      &created);
 }
 
+static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av,
+		       struct list_head *list);
+
 /**
  * ubi_remove_av - delete attaching information about a volume.
  * @ai: attaching information
  * @av: the volume attaching information to delete
  */
 void ubi_remove_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
 {
-	struct rb_node *rb;
-	struct ubi_ainf_peb *aeb;
-
 	dbg_bld("remove attaching information about volume %d", av->vol_id);
 
-	while ((rb = rb_first(&av->root))) {
-		aeb = rb_entry(rb, struct ubi_ainf_peb, u.rb);
-		rb_erase(&aeb->u.rb, &av->root);
-		list_add_tail(&aeb->u.list, &ai->erase);
-	}
-
 	rb_erase(&av->rb, &ai->volumes);
-	kfree(av);
+	destroy_av(ai, av, &ai->erase);
 	ai->vols_found -= 1;
 }
 
@@ -1256,10 +1250,12 @@ static int late_analysis(struct ubi_device *ubi, struct ubi_attach_info *ai)
  * destroy_av - free volume attaching information.
  * @av: volume attaching information
  * @ai: attaching information
+ * @list: put the aeb elements in there if !NULL, otherwise free them
  *
  * This function destroys the volume attaching information.
  */
-static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
+static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av,
+		       struct list_head *list)
 {
 	struct ubi_ainf_peb *aeb;
 	struct rb_node *this = av->root.rb_node;
@@ -1279,7 +1275,10 @@ static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
 					this->rb_right = NULL;
 			}
 
-			kmem_cache_free(ai->aeb_slab_cache, aeb);
+			if (list)
+				list_add_tail(&aeb->u.list, list);
+			else
+				kmem_cache_free(ai->aeb_slab_cache, aeb);
 		}
 	}
 	kfree(av);
@@ -1334,7 +1333,7 @@ static void destroy_ai(struct ubi_attach_info *ai)
 					rb->rb_right = NULL;
 			}
 
-			destroy_av(ai, av);
+			destroy_av(ai, av, NULL);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -722,26 +722,20 @@ struct ubi_ainf_volume ubi_find_av(const struct ubi_attach_info ai,`
`722`	`722`	`&created);`
`723`	`723`	`}`
`724`	`724`
	`725`	`+static void destroy_av(struct ubi_attach_info ai, struct ubi_ainf_volume av,`
	`726`	`+ struct list_head *list);`
	`727`	`+`
`725`	`728`	`/**`
`726`	`729`	`* ubi_remove_av - delete attaching information about a volume.`
`727`	`730`	`* @ai: attaching information`
`728`	`731`	`* @av: the volume attaching information to delete`
`729`	`732`	`*/`
`730`	`733`	`void ubi_remove_av(struct ubi_attach_info ai, struct ubi_ainf_volume av)`
`731`	`734`	`{`
`732`		`- struct rb_node *rb;`
`733`		`- struct ubi_ainf_peb *aeb;`
`734`		`-`
`735`	`735`	`dbg_bld("remove attaching information about volume %d", av->vol_id);`
`736`	`736`
`737`		`- while ((rb = rb_first(&av->root))) {`
`738`		`- aeb = rb_entry(rb, struct ubi_ainf_peb, u.rb);`
`739`		`- rb_erase(&aeb->u.rb, &av->root);`
`740`		`- list_add_tail(&aeb->u.list, &ai->erase);`
`741`		`- }`
`742`		`-`
`743`	`737`	`rb_erase(&av->rb, &ai->volumes);`
`744`		`- kfree(av);`
	`738`	`+ destroy_av(ai, av, &ai->erase);`
`745`	`739`	`ai->vols_found -= 1;`
`746`	`740`	`}`
`747`	`741`
`@@ -1256,10 +1250,12 @@ static int late_analysis(struct ubi_device ubi, struct ubi_attach_info ai)`
`1256`	`1250`	`* destroy_av - free volume attaching information.`
`1257`	`1251`	`* @av: volume attaching information`
`1258`	`1252`	`* @ai: attaching information`
	`1253`	`+ * @list: put the aeb elements in there if !NULL, otherwise free them`
`1259`	`1254`	`*`
`1260`	`1255`	`* This function destroys the volume attaching information.`
`1261`	`1256`	`*/`
`1262`		`-static void destroy_av(struct ubi_attach_info ai, struct ubi_ainf_volume av)`
	`1257`	`+static void destroy_av(struct ubi_attach_info ai, struct ubi_ainf_volume av,`
	`1258`	`+ struct list_head *list)`
`1263`	`1259`	`{`
`1264`	`1260`	`struct ubi_ainf_peb *aeb;`
`1265`	`1261`	`struct rb_node *this = av->root.rb_node;`
`@@ -1279,7 +1275,10 @@ static void destroy_av(struct ubi_attach_info ai, struct ubi_ainf_volume av)`
`1279`	`1275`	`this->rb_right = NULL;`
`1280`	`1276`	`}`
`1281`	`1277`
`1282`		`- kmem_cache_free(ai->aeb_slab_cache, aeb);`
	`1278`	`+ if (list)`
	`1279`	`+ list_add_tail(&aeb->u.list, list);`
	`1280`	`+ else`
	`1281`	`+ kmem_cache_free(ai->aeb_slab_cache, aeb);`
`1283`	`1282`	`}`
`1284`	`1283`	`}`
`1285`	`1284`	`kfree(av);`
`@@ -1334,7 +1333,7 @@ static void destroy_ai(struct ubi_attach_info *ai)`
`1334`	`1333`	`rb->rb_right = NULL;`
`1335`	`1334`	`}`
`1336`	`1335`
`1337`		`- destroy_av(ai, av);`
	`1336`	`+ destroy_av(ai, av, NULL);`
`1338`	`1337`	`}`
`1339`	`1338`	`}`
`1340`	`1339`