Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f3d8ba2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move bio list helpers into bio.h 



It's used by DM and MD and generally useful, so move the bio list
helpers into bio.h.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarAlasdair G Kergon <agk@redhat.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 0882e8dd

drivers/md/dm-bio-list.h

deleted100644 → 0
+0 −117
Original line number Diff line number Diff line 
/*

 * 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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/vmalloc.h>



#include "dm.h"

#include "dm-bio-list.h"



#define	DM_MSG_PREFIX	"region hash"