diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /fs/block_dev.c | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 2980eabe5779..6339a30879b7 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
| @@ -172,7 +172,7 @@ blkdev_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, | |||
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | #if 0 | 174 | #if 0 |
| 175 | static int blk_end_aio(struct bio *bio, unsigned int bytes_done, int error) | 175 | static void blk_end_aio(struct bio *bio, int error) |
| 176 | { | 176 | { |
| 177 | struct kiocb *iocb = bio->bi_private; | 177 | struct kiocb *iocb = bio->bi_private; |
| 178 | atomic_t *bio_count = &iocb->ki_bio_count; | 178 | atomic_t *bio_count = &iocb->ki_bio_count; |