iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

Browse Source 
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: fix mis-synchronisation in blkdev_issue_zeroout()
This commit is contained in:
Linus Torvalds 2011-03-13 15:50:37 -07:00
commit 28db837693
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
block/blk-lib.c
View File

@ -109,7 +109,6 @@ struct bio_batch
atomic_t done; atomic_t done;
unsigned long flags; unsigned long flags;
struct completion *wait; struct completion *wait;
bio_end_io_t *end_io;
}; };
static void bio_batch_end_io(struct bio *bio, int err) static void bio_batch_end_io(struct bio *bio, int err)
@ -122,12 +121,9 @@ static void bio_batch_end_io(struct bio *bio, int err)
else else
clear_bit(BIO_UPTODATE, &bb->flags); clear_bit(BIO_UPTODATE, &bb->flags);
} }
if (bb) { if (bb)
if (bb->end_io) if (atomic_dec_and_test(&bb->done))
bb->end_io(bio, err); complete(bb->wait);
atomic_inc(&bb->done);
complete(bb->wait);
}
bio_put(bio); bio_put(bio);
} }
@ -150,13 +146,12 @@ int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
int ret; int ret;
struct bio *bio; struct bio *bio;
struct bio_batch bb; struct bio_batch bb;
unsigned int sz, issued = 0; unsigned int sz;
DECLARE_COMPLETION_ONSTACK(wait); DECLARE_COMPLETION_ONSTACK(wait);
atomic_set(&bb.done, 0); atomic_set(&bb.done, 1);
bb.flags = 1 << BIO_UPTODATE; bb.flags = 1 << BIO_UPTODATE;
bb.wait = &wait; bb.wait = &wait;
bb.end_io = NULL;
submit: submit:
ret = 0; ret = 0;
@ -185,12 +180,12 @@ submit:
break; break;
} }
ret = 0; ret = 0;
issued++; atomic_inc(&bb.done);
submit_bio(WRITE, bio); submit_bio(WRITE, bio);
} }
/* Wait for bios in-flight */ /* Wait for bios in-flight */
while (issued != atomic_read(&bb.done)) if (!atomic_dec_and_test(&bb.done))
wait_for_completion(&wait); wait_for_completion(&wait);
if (!test_bit(BIO_UPTODATE, &bb.flags)) if (!test_bit(BIO_UPTODATE, &bb.flags))