[PATCH]
Subsystems (3)
PATCH 1/1 [PATCH]
It's used by DM and MD and generally useful, so move the bio list helpers into bio.h.
drivers/md/dm-bio-list.h deleted +0 -117
@@ -1,117 +0,0 @@ -/* -* Copyright (C) 2004 Red Hat UK Ltd. -* -* This file is released under the GPL. -*/ - -#ifndef DM_BIO_LIST_H -#define DM_BIO_LIST_H - -#include <linux/bio.h> - -#ifdef CONFIG_BLOCK - -struct bio_list { -struct bio *head; -struct bio *tail; -}; - -static inline int bio_list_empty (const struct bio_list *bl) -{ -return bl->head ==NULL ; -} - -static inline void bio_list_init (struct bio_list *bl) -{ - bl->head = bl->tail =NULL ; -} - -#define bio_list_for_each (bio, bl) \ - for (bio = (bl)->head; bio; bio = bio->bi_next) - -static inline unsigned bio_list_size (const struct bio_list *bl) -{ -unsigned sz =0 ; -struct bio *bio; - -bio_list_for_each (bio, bl) - sz++; - -return sz; -} - -static inline void bio_list_add (struct bio_list *bl,struct bio *bio) -{ - bio->bi_next =NULL ; - -if (bl->tail) - bl->tail->bi_next = bio; -else - bl->head = bio; - - bl->tail = bio; -} - -static inline void bio_list_add_head (struct bio_list *bl,struct bio *bio) -{ - bio->bi_next = bl->head; - - bl->head = bio; - -if (!bl->tail) - bl->tail = 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 - bl->head = bl2->head; - - bl->tail = bl2->tail; -} - -static inline void bio_list_merge_head (struct bio_list *bl, -struct bio_list *bl2) -{ -if (!bl2->head) -return ; - -if (bl->head) - bl2->tail->bi_next = bl->head; -else - bl->tail = bl2->tail; - - bl->head = bl2->head; -} - -static inline struct bio *bio_list_pop (struct bio_list *bl) -{ -struct bio *bio = bl->head; - -if (bio) { - bl->head = bl->head->bi_next; -if (!bl->head) - bl->tail =NULL ; - - bio->bi_next =NULL ; - } - -return bio; -} - -static inline struct bio *bio_list_get (struct bio_list *bl) -{ -struct bio *bio = bl->head; - - bl->head = bl->tail =NULL ; - -return bio; -} - -#endif /* CONFIG_BLOCK */ -#endif
drivers/md/dm-delay.c +0 -2
@@ -15,8 +15,6 @@#include <linux/device-mapper.h> -#include "dm-bio-list.h" -#define DM_MSG_PREFIX "delay"struct delay_c {
drivers/md/dm-mpath.c +0 -1
@@ -8,7 +8,6 @@#include <linux/device-mapper.h> #include "dm-path-selector.h" -#include "dm-bio-list.h" #include "dm-bio-record.h" #include "dm-uevent.h"
drivers/md/dm-raid1.c +0 -1
@@ -5,7 +5,6 @@* This file is released under the GPL. */ -#include "dm-bio-list.h" #include "dm-bio-record.h" #include <linux/init.h>
drivers/md/dm-region-hash.c +0 -1
@@ -14,7 +14,6 @@#include <linux/vmalloc.h> #include "dm.h" -#include "dm-bio-list.h" #define DM_MSG_PREFIX "region hash"
drivers/md/dm-snap.c +0 -1
@@ -22,7 +22,6 @@#include <linux/workqueue.h> #include "dm-exception-store.h" -#include "dm-bio-list.h" #define DM_MSG_PREFIX "snapshots"
drivers/md/dm.c +0 -1
@@ -6,7 +6,6 @@*/ #include "dm.h" -#include "dm-bio-list.h" #include "dm-uevent.h" #include <linux/init.h>
drivers/md/raid1.c +0 -1
@@ -35,7 +35,6 @@#include <linux/blkdev.h> #include <linux/seq_file.h> #include "md.h" -#include "dm-bio-list.h" #include "raid1.h" #include "bitmap.h"
drivers/md/raid10.c +0 -1
@@ -22,7 +22,6 @@#include <linux/blkdev.h> #include <linux/seq_file.h> #include "md.h" -#include "dm-bio-list.h" #include "raid10.h" #include "bitmap.h"
include/linux/bio.h +109 -0
115 lines not on this page · raw message
Alasdair G Kergon
maintainerPATCH 1/1 dm: move bio_list fns to bio.h (was [PATCH])
Quoted 2 lines · Christoph Hellwig
It's used by DM and MD and generally useful, so move the bio list helpers into
bio.h.
A good idea.
Jens - do you want to pick that up or shall I include it with the next little batch (dm barrier support!) I'm preparing?
Alasdair
Signature · 1 line
[email protected]
Re: [PATCH] dm: move bio_list fns to bio.h (was [PATCH])
Quoted 8 lines · Alasdair G Kergon
Quoted 2 lines · Christoph Hellwig
It's used by DM and MD and generally useful, so move the bio list helpers into
bio.h.A good idea.
Jens - do you want to pick that up or shall I include it with the next little batch (dm barrier support!) I'm preparing?
Agree, it's a good idea. I'll just include it in the next pull, unless it makes life more difficult for you.
Signature · 1 line
Jens Axboe