dm bio prison: use rb_entry() rather than container_of()

To make the code clearer, use rb_entry() instead of container_of() to
deal with rbtree.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Acked-by: Coly Li <colyli@suse.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

diff --git a/drivers/md/dm-bio-prison-v1.c b/drivers/md/dm-bio-prison-v1.c
index 82d27384d31f523ec11bf580ba5c165b77319956..874841f0fc837a1c631771fc29c0c6130975b573 100644 (file)
--- a/drivers/md/dm-bio-prison-v1.c
+++ b/drivers/md/dm-bio-prison-v1.c
@@ -116,7 +116,7 @@ static int __bio_detain(struct dm_bio_prison *prison,
 
        while (*new) {
                struct dm_bio_prison_cell *cell =
-                       container_of(*new, struct dm_bio_prison_cell, node);
+                       rb_entry(*new, struct dm_bio_prison_cell, node);
 
                r = cmp_keys(key, &cell->key);
 

diff --git a/drivers/md/dm-bio-prison-v2.c b/drivers/md/dm-bio-prison-v2.c
index c9b11f799cd8e7a32f370cfcd04d39bddbcbe2d2..8ce3a1a588cfd064b0249ea0f90e32934b81858e 100644 (file)
--- a/drivers/md/dm-bio-prison-v2.c
+++ b/drivers/md/dm-bio-prison-v2.c
@@ -120,7 +120,7 @@ static bool __find_or_insert(struct dm_bio_prison_v2 *prison,
 
        while (*new) {
                struct dm_bio_prison_cell_v2 *cell =
-                       container_of(*new, struct dm_bio_prison_cell_v2, node);
+                       rb_entry(*new, struct dm_bio_prison_cell_v2, node);
 
                r = cmp_keys(key, &cell->key);