From 1f0033fdad55c9898f49cbcf48ec321ef5332f79 Mon Sep 17 00:00:00 2001 From: Alasdair G Kergon Date: Fri, 19 Oct 2007 22:38:55 +0100 Subject: [PATCH] --- yaml --- r: 71720 b: refs/heads/master c: 051814c69fac92f1964739c0cf08b5e3b1156b04 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-bio-list.h | 5 ----- trunk/drivers/md/dm-delay.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a3e03d0a104a..86f54bbad9c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb56acf840600421e68f49bb037d1c659fcb37f8 +refs/heads/master: 051814c69fac92f1964739c0cf08b5e3b1156b04 diff --git a/trunk/drivers/md/dm-bio-list.h b/trunk/drivers/md/dm-bio-list.h index 3f7b827649e3..d4509be0fe67 100644 --- a/trunk/drivers/md/dm-bio-list.h +++ b/trunk/drivers/md/dm-bio-list.h @@ -21,11 +21,6 @@ static inline int bio_list_empty(const struct bio_list *bl) return bl->head == NULL; } -#define BIO_LIST_INIT { .head = NULL, .tail = NULL } - -#define BIO_LIST(bl) \ - struct bio_list bl = BIO_LIST_INIT - static inline void bio_list_init(struct bio_list *bl) { bl->head = bl->tail = NULL; diff --git a/trunk/drivers/md/dm-delay.c b/trunk/drivers/md/dm-delay.c index 719f871bbd56..bdd37f881c42 100644 --- a/trunk/drivers/md/dm-delay.c +++ b/trunk/drivers/md/dm-delay.c @@ -83,7 +83,7 @@ static struct bio *flush_delayed_bios(struct delay_c *dc, int flush_all) struct dm_delay_info *delayed, *next; unsigned long next_expires = 0; int start_timer = 0; - BIO_LIST(flush_bios); + struct bio_list flush_bios = { }; mutex_lock(&delayed_bios_lock); list_for_each_entry_safe(delayed, next, &dc->delayed_bios, list) {