Skip to contentSkip to conversation

additional bio list helpers

PATCH In review Bryn M. Reeves 2 participants 3 messages Feb 6, 2007 – Feb 7, 2007 Device mapper

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 additional bio list helpers

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Add a couple of extra helper routines to drivers/md/dm-bio-list.h. This patch is required for the current dm-loop patch.

Kind regards,

Bryn.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iD8DBQFFyF+/6YSQoMYUY94RAnB0AJ9CUAbLJhy9sGeAkQuKvjfPOcXFhgCfXqXT td9QjIOQK+ECBVf3H0Wl83g=
=NX1z
-----END PGP SIGNATURE-----

Add additional bio list helpers to dm-bio-list.h:

bio_list_empty
bio_list_nr
bio_list_join
bio_list_join_init
bio_list_merge_init
bio_list_push

These are used by dm-loop for manipulating lists of bios to be resubmitted by the fs I/O code.

===================================================================

drivers/md/dm-bio-list.h +56 -3
index da43496..301efae 100644
@@ -14,11 +14,33 @@ struct bio_list {
 	struct bio *tail;
 };
 
+static inline int  bio_list_empty(struct bio_list *bl)
+{
+	return bl->head == NULL && bl->tail == NULL;
+}
+
+#define BIO_LIST_HEAD(bl)	struct bio_list bl = { NULL, NULL }
+
 static inline void bio_list_init(struct bio_list *bl)
 {
 	bl->head = bl->tail = NULL;
 }
 
+#define bio_for_each(bio, bl) \
+	for (bio = (bl)->head; bio; bio = bio->bi_next)
+
+static inline int bio_list_nr(struct bio_list *bl)
+{
+	int i=0;
+	struct bio *bio;
+
+	if(bio_list_empty(bl))
+		return i;
+	bio_for_each(bio, bl)
+		i++;
+	return i;
+}
+
 static inline void bio_list_add(struct bio_list *bl, struct bio *bio)
 {
 	bio->bi_next = NULL;
@@ -33,9 +55,6 @@ static inline void bio_list_add(struct bio_list *bl, struct bio *bio)
 
 static inline void bio_list_merge(struct bio_list *bl, struct bio_list *bl2)
 {
-	if (!bl2->head)
-		return;
-
 	if (bl->tail)
 		bl->tail->bi_next = bl2->head;
 	else
@@ -58,6 +77,40 @@ static inline void bio_list_merge_head(struct bio_list *bl,
 	bl->head = bl2->head;
 }
 
+static inline void bio_list_join(struct bio_list *bl, struct bio_list *bl2)
+{
+	if (bio_list_empty(bl2))
+		return;
+
+	bl2->tail->bi_next = bl->head;
+	bl->head = bl2->head;
+
+	if (!bl->tail)
+		bl->tail = bl2->tail;
+}
+
+static inline void bio_list_join_init(struct bio_list *bl, struct bio_list *bl2)
+{
+	bio_list_join(bl, bl2);
+	bio_list_init(bl2);
+}
+
+static inline void bio_list_merge_init(struct bio_list *bl,
+				       struct bio_list *bl2)
+{
+	bio_list_merge(bl, bl2);
+	bio_list_init(bl2);
+}
+
+static inline void bio_list_push(struct bio_list *bl, struct bio *bio)
+{
+	bio->bi_next = bl->head;
+	bl->head = bio;
+
+	if (!bl->tail)
+		bl->tail = bio;
+}
+
 static inline struct bio *bio_list_pop(struct bio_list *bl)
 {
 	struct bio *bio = bl->head;
#1 lore raw

Hi Bryn,

drivers/md/dm-bio-list.h static inline void bio_list_add(struct bio_list *bl, struct bio *bio) · line 60

Quoted 10 lines · Bryn M. Reeves
drivers/md/dm-bio-list.h +0 -3
@@ -33,9 +55,6 @@ static inline void bio_list_add(struct bio_list *bl, struct bio *bio)
 
 static inline void bio_list_merge(struct bio_list *bl, struct bio_list *bl2)
 {
-	if (!bl2->head)
-		return;
-
 	if (bl->tail)
 		bl->tail->bi_next = bl2->head;
 	else

This one breaks the bio_list if bl2 is a empty list. Probably missed to add like below?
-----------------------------------
+ if (bio_list_empty(bl2))
+ return;
-----------------------------------

Other small comments are below:

drivers/md/dm-bio-list.h struct bio_list { · line 20

Quoted 8 lines
drivers/md/dm-bio-list.h +4 -0
@@ -14,11 +14,33 @@ struct bio_list {
 	struct bio *tail;
 };
 
+static inline int  bio_list_empty(struct bio_list *bl)
+{
+	return bl->head == NULL && bl->tail == NULL;
+}

I think that bl->tail is always NULL when bl->head is NULL, unless the bio_list is corrupted. So no need to check bl->tail.

drivers/md/dm-bio-list.h struct bio_list { · line 38

Quoted 10 lines
drivers/md/dm-bio-list.h +10 -0
+#define bio_for_each(bio, bl) \
+	for (bio = (bl)->head; bio; bio = bio->bi_next)
+
+static inline int bio_list_nr(struct bio_list *bl)
+{
+	int i=0;
+	struct bio *bio;
+
+	if(bio_list_empty(bl))
+		return i;

I think that this check in not needed because it is covered by bio_for_each() below.

Quoted 17 lines
drivers/md/dm-bio-list.h +11 -0
+	bio_for_each(bio, bl)
+		i++;
+	return i;
+}
 
 
@@ -58,6 +77,40 @@ static inline void bio_list_merge_head(struct bio_list *bl,
 	bl->head = bl2->head;
 }
 
+static inline void bio_list_join(struct bio_list *bl, struct bio_list *bl2)
+{
+	if (bio_list_empty(bl2))
+		return;
+
+	bl2->tail->bi_next = bl->head;
+	bl->head = bl2->head;

drivers/md/dm-bio-list.h static inline void bio_list_merge_head(struct bio_list *bl, · line 96

Quoted 10 lines
drivers/md/dm-bio-list.h +10 -0
+
+	if (!bl->tail)
+		bl->tail = bl2->tail;
+}
+
+static inline void bio_list_join_init(struct bio_list *bl, struct bio_list *bl2)
+{
+	bio_list_join(bl, bl2);
+	bio_list_init(bl2);
+}

I think that bio_list_join() is same as existing bio_list_merge_head().

Regards,
Kiyoshi Ueda

#2 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Kiyoshi,

Review

Quoted 6 lines · Kiyoshi Ueda

This one breaks the bio_list if bl2 is a empty list. Probably missed to add like below?
-----------------------------------

(quoted diff) +2 -1
+	if (bio_list_empty(bl2))
+		return;
-----------------------------------

Quite right - fixed, thanks!

Quoted 2 lines

I think that bl->tail is always NULL when bl->head is NULL, unless the bio_list is corrupted. So no need to check bl->tail.

This was actually already changed in my git copy, but I forgot to re-generate the patch before posting - apologies!

Quoted 2 lines

I think that this check in not needed because it is covered by bio_for_each() below.

Agreed!

Quoted 1 line

I think that bio_list_join() is same as existing bio_list_merge_head().

Also agreed - thanks for catching these. This one also isn't used by dm-loop anyway.

Revised patch attached - this time just including the changes actually needed by the dm-loop patch:

bio_list_empty
bio_for_each
bio_list_nr
bio_list_merge_init

Kind regards,

Bryn.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iD8DBQFFybdW6YSQoMYUY94RAgZxAKChuSEQAP0zs+f9/yzjCf92beTkJQCdEQBq oxBR+Xsj1V6Fj4r9ec3sPZ0=
=nIAj
-----END PGP SIGNATURE-----

Add additional bio list helpers to dm-bio-list.h:

bio_list_empty
bio_for_each
bio_list_nr
bio_list_merge_init

These are used by dm-loop for manipulating lists of bios to be resubmitted by the fs I/O code.

===================================================================

drivers/md/dm-bio-list.h +27 -0
index da43496..6db7644 100644
@@ -14,11 +14,31 @@ struct bio_list {
 	struct bio *tail;
 };
 
+static inline int  bio_list_empty(struct bio_list *bl)
+{
+	return bl->head == NULL;
+}
+
+#define BIO_LIST_HEAD(bl)	struct bio_list bl = { NULL, NULL }
+
 static inline void bio_list_init(struct bio_list *bl)
 {
 	bl->head = bl->tail = NULL;
 }
 
+#define bio_for_each(bio, bl) \
+	for (bio = (bl)->head; bio; bio = bio->bi_next)
+
+static inline int bio_list_nr(struct bio_list *bl)
+{
+	int i=0;
+	struct bio *bio;
+
+	bio_for_each(bio, bl)
+		i++;
+	return i;
+}
+
 static inline void bio_list_add(struct bio_list *bl, struct bio *bio)
 {
 	bio->bi_next = NULL;
@@ -58,6 +78,13 @@ static inline void bio_list_merge_head(struct bio_list *bl,
 	bl->head = bl2->head;
 }
 
+static inline void bio_list_merge_init(struct bio_list *bl,
+				       struct bio_list *bl2)
+{
+	bio_list_merge(bl, bl2);
+	bio_list_init(bl2);
+}
+
 static inline struct bio *bio_list_pop(struct bio_list *bl)
 {
 	struct bio *bio = bl->head;