lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

loop: use BIO list management functions

Browse Source 
Now that the bio list management stuff is generic, convert loop to use
bio lists instead of its own private bio list implementation.

Cc:  Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Akinobu Mita
2009-04-17 08:41:21 +02:00
committed by Jens Axboe
parent e93b9fb7d8
commit e686307fdc
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/block/loop.c
View File

@@ -511,11 +511,7 @@ out:
*/ */
static void loop_add_bio(struct loop_device *lo, struct bio *bio) static void loop_add_bio(struct loop_device *lo, struct bio *bio)
{ {
if (lo->lo_biotail) { bio_list_add(&lo->lo_bio_list, bio);
lo->lo_biotail->bi_next = bio;
lo->lo_biotail = bio;
} else
lo->lo_bio = lo->lo_biotail = bio;
} }
/* /*
@@ -523,16 +519,7 @@ static void loop_add_bio(struct loop_device *lo, struct bio *bio)
*/ */
static struct bio *loop_get_bio(struct loop_device *lo) static struct bio *loop_get_bio(struct loop_device *lo)
{ {
struct bio *bio; return bio_list_pop(&lo->lo_bio_list);
if ((bio = lo->lo_bio)) {
if (bio == lo->lo_biotail)
lo->lo_biotail = NULL;
lo->lo_bio = bio->bi_next;
bio->bi_next = NULL;
}
return bio;
} }
static int loop_make_request(struct request_queue *q, struct bio *old_bio) static int loop_make_request(struct request_queue *q, struct bio *old_bio)
@@ -609,12 +596,13 @@ static int loop_thread(void *data)
set_user_nice(current, -20); set_user_nice(current, -20);
while (!kthread_should_stop() || lo->lo_bio) { while (!kthread_should_stop() || !bio_list_empty(&lo->lo_bio_list)) {
wait_event_interruptible(lo->lo_event, wait_event_interruptible(lo->lo_event,
lo->lo_bio || kthread_should_stop()); !bio_list_empty(&lo->lo_bio_list) ||
kthread_should_stop());
if (!lo->lo_bio) if (bio_list_empty(&lo->lo_bio_list))
continue; continue;
spin_lock_irq(&lo->lo_lock); spin_lock_irq(&lo->lo_lock);
bio = loop_get_bio(lo); bio = loop_get_bio(lo);
@@ -841,7 +829,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
lo->old_gfp_mask = mapping_gfp_mask(mapping); lo->old_gfp_mask = mapping_gfp_mask(mapping);
mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS)); mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
lo->lo_bio = lo->lo_biotail = NULL; bio_list_init(&lo->lo_bio_list);
/* /*
* set queue make_request_fn, and add limits based on lower level * set queue make_request_fn, and add limits based on lower level

2
include/linux/bio.h
View File

@@ -506,7 +506,7 @@ static inline int bio_has_data(struct bio *bio)
} }
/* /*
* BIO list managment for use by remapping drivers (e.g. DM or MD). * BIO list management for use by remapping drivers (e.g. DM or MD) and loop.
* *
* A bio_list anchors a singly-linked list of bios chained through the bi_next * A bio_list anchors a singly-linked list of bios chained through the bi_next
* member of the bio. The bio_list also caches the last list member to allow * member of the bio. The bio_list also caches the last list member to allow

3
include/linux/loop.h
View File

@@ -56,8 +56,7 @@ struct loop_device {
gfp_t old_gfp_mask; gfp_t old_gfp_mask;
spinlock_t lo_lock; spinlock_t lo_lock;
struct bio *lo_bio; struct bio_list lo_bio_list;
struct bio *lo_biotail;
int lo_state; int lo_state;
struct mutex lo_ctl_mutex; struct mutex lo_ctl_mutex;
struct task_struct *lo_thread; struct task_struct *lo_thread;