[2.6.23 PATCH 01/18] dm: bio_list macro renaming

[2.6.23 PATCH 01/18] dm: bio_list macro renaming

[Alasdair G Kergon]

From: Alasdair G Kergon <agk@redhat.com>

Rename BIO_LIST() macro to DEFINE_BIO_LIST(), named similarly to
DEFINE_SPINLOCK().

Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

---
 drivers/md/dm-bio-list.h |    2 +-
 drivers/md/dm-delay.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux/drivers/md/dm-bio-list.h
===================================================================
--- linux.orig/drivers/md/dm-bio-list.h	2007-07-11 21:37:33.000000000 +0100
+++ linux/drivers/md/dm-bio-list.h	2007-07-11 21:37:36.000000000 +0100
@@ -22,7 +22,7 @@ static inline int bio_list_empty(const s
 
 #define BIO_LIST_INIT { .head = NULL, .tail = NULL }
 
-#define BIO_LIST(bl) \
+#define DEFINE_BIO_LIST(bl) \
 	struct bio_list bl = BIO_LIST_INIT
 
 static inline void bio_list_init(struct bio_list *bl)
Index: linux/drivers/md/dm-delay.c
===================================================================
--- linux.orig/drivers/md/dm-delay.c	2007-07-11 21:37:33.000000000 +0100
+++ linux/drivers/md/dm-delay.c	2007-07-11 21:37:36.000000000 +0100
@@ -83,7 +83,7 @@ static struct bio *flush_delayed_bios(st
 	struct delay_info *delayed, *next;
 	unsigned long next_expires = 0;
 	int start_timer = 0;
-	BIO_LIST(flush_bios);
+	DEFINE_BIO_LIST(flush_bios);
 
 	mutex_lock(&delayed_bios_lock);
 	list_for_each_entry_safe(delayed, next, &dc->delayed_bios, list) {

Re: [2.6.23 PATCH 01/18] dm: bio_list macro renaming

[Andrew Morton]

On Wed, 11 Jul 2007 21:56:35 +0100
Alasdair G Kergon <agk@redhat.com> wrote:

> From: Alasdair G Kergon <agk@redhat.com>
> 
> Rename BIO_LIST() macro to DEFINE_BIO_LIST(), named similarly to
> DEFINE_SPINLOCK().
> 
> Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
> 
> ---
>  drivers/md/dm-bio-list.h |    2 +-
>  drivers/md/dm-delay.c    |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> Index: linux/drivers/md/dm-bio-list.h
> ===================================================================
> --- linux.orig/drivers/md/dm-bio-list.h	2007-07-11 21:37:33.000000000 +0100
> +++ linux/drivers/md/dm-bio-list.h	2007-07-11 21:37:36.000000000 +0100
> @@ -22,7 +22,7 @@ static inline int bio_list_empty(const s
>  
>  #define BIO_LIST_INIT { .head = NULL, .tail = NULL }
>  
> -#define BIO_LIST(bl) \
> +#define DEFINE_BIO_LIST(bl) \
>  	struct bio_list bl = BIO_LIST_INIT
>  
>  static inline void bio_list_init(struct bio_list *bl)
> Index: linux/drivers/md/dm-delay.c
> ===================================================================
> --- linux.orig/drivers/md/dm-delay.c	2007-07-11 21:37:33.000000000 +0100
> +++ linux/drivers/md/dm-delay.c	2007-07-11 21:37:36.000000000 +0100
> @@ -83,7 +83,7 @@ static struct bio *flush_delayed_bios(st
>  	struct delay_info *delayed, *next;
>  	unsigned long next_expires = 0;
>  	int start_timer = 0;
> -	BIO_LIST(flush_bios);
> +	DEFINE_BIO_LIST(flush_bios);
>  
>  	mutex_lock(&delayed_bios_lock);
>  	list_for_each_entry_safe(delayed, next, &dc->delayed_bios, list) {

As there is only one caller, why not remove the unpleasant-looking
BIO_LIST and DEFINE_BIO_LIST altogether and just do

	struct bio_list flush_bios = { };

at that single callsite?