[dm-bio-prison] rename some parameters to dm_bio_detain.

memory -> cell_prealloc ref -> cell_result
jthornber · Jan 22, 2013 · cf5273f · cf5273f
1 parent ed52136
commit cf5273f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/drivers/md/dm-bio-prison.c b/drivers/md/dm-bio-prison.c
@@ -135,8 +135,8 @@ static void __setup_new_cell(struct dm_bio_prison *prison,
 static int __bio_detain(struct dm_bio_prison *prison,
 			struct dm_cell_key *key,
 			struct bio *inmate,
-			struct dm_bio_prison_cell *memory,
-			struct dm_bio_prison_cell **ref)
+			struct dm_bio_prison_cell *cell_prealloc,
+			struct dm_bio_prison_cell **cell_result)
 {
 	uint32_t hash = hash_key(prison, key);
 	struct dm_bio_prison_cell *cell;
@@ -145,26 +145,26 @@ static int __bio_detain(struct dm_bio_prison *prison,
 	if (cell) {
 		if (inmate)
 			bio_list_add(&cell->bios, inmate);
-		*ref = cell;
+		*cell_result = cell;
 		return 1;
 	}
 
-	__setup_new_cell(prison, key, inmate, hash, memory);
-	*ref = memory;
+	__setup_new_cell(prison, key, inmate, hash, cell_prealloc);
+	*cell_result = cell_prealloc;
 	return 0;
 }
 
 static int bio_detain(struct dm_bio_prison *prison,
 		      struct dm_cell_key *key,
 		      struct bio *inmate,
-		      struct dm_bio_prison_cell *memory,
-		      struct dm_bio_prison_cell **ref)
+		      struct dm_bio_prison_cell *cell_prealloc,
+		      struct dm_bio_prison_cell **cell_result)
 {
 	int r;
 	unsigned long flags;
 
 	spin_lock_irqsave(&prison->lock, flags);
-	r = __bio_detain(prison, key, inmate, memory, ref);
+	r = __bio_detain(prison, key, inmate, cell_prealloc, cell_result);
 	spin_unlock_irqrestore(&prison->lock, flags);
 
 	return r;
@@ -173,10 +173,10 @@ static int bio_detain(struct dm_bio_prison *prison,
 int dm_bio_detain(struct dm_bio_prison *prison,
 		  struct dm_cell_key *key,
 		  struct bio *inmate,
-		  struct dm_bio_prison_cell *memory,
-		  struct dm_bio_prison_cell **ref)
+		  struct dm_bio_prison_cell *cell_prealloc,
+		  struct dm_bio_prison_cell **cell_result)
 {
-	return bio_detain(prison, key, inmate, memory, ref);
+	return bio_detain(prison, key, inmate, cell_prealloc, cell_result);
 }
 EXPORT_SYMBOL_GPL(dm_bio_detain);
 

diff --git a/drivers/md/dm-bio-prison.h b/drivers/md/dm-bio-prison.h
@@ -53,12 +53,12 @@ void dm_bio_prison_free_cell(struct dm_bio_prison *prison,
  * Creates, or retrieves a cell for the given key.
  *
  * Returns 1 if pre-existing cell returned, zero if new cell created using
- * @memory.
+ * @cell_prealloc.
  */
 int dm_get_cell(struct dm_bio_prison *prison,
 		struct dm_cell_key *key,
-		struct dm_bio_prison_cell *memory,
-		struct dm_bio_prison_cell **ref);
+		struct dm_bio_prison_cell *cell_prealloc,
+		struct dm_bio_prison_cell **cell_result);
 
 /*
  * An atomic op that combines retrieving a cell, and adding a bio to it.