diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-11 11:44:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-11 11:44:59 -0800 |
| commit | b506d1b6c49a5884ff67a29bc99a1912ee20acee (patch) | |
| tree | 0c7734b5cb859d62720c18afdf3fe144b5cce5ff /drivers | |
| parent | 646fd12784d506180353005f40f90bcf08c84a3e (diff) | |
| parent | 11a57153e3377ffdf8cfca2eda9a99063f66b957 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
blktrace: kill the unneeded initcall
block: fix blktrace timestamps
loop: fix bad bio_alloc() nr_iovec request
Don't blatt first element of prv in sg_chain()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/loop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 56e23042728..b8af22e610d 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -610,7 +610,7 @@ static int loop_thread(void *data) static int loop_switch(struct loop_device *lo, struct file *file) { struct switch_request w; - struct bio *bio = bio_alloc(GFP_KERNEL, 1); + struct bio *bio = bio_alloc(GFP_KERNEL, 0); if (!bio) return -ENOMEM; init_completion(&w.wait); |