diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-11 16:01:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-11 16:01:06 -0700 |
| commit | dc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd (patch) | |
| tree | 7b353684090d23b1e2e3f85bf83df491f04dcc8a /drivers/md/dm.c | |
| parent | d291676ce8bc1d8ef93488023d04027010596de3 (diff) | |
| parent | 02a5e0acb3cb85d80d0fe834e366d38a92bbaa22 (diff) | |
| download | kernel_samsung_aries-dc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd.zip kernel_samsung_aries-dc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd.tar.gz kernel_samsung_aries-dc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
BLOCK: Hide the contents of linux/bio.h if CONFIG_BLOCK=n
sysace: HDIO_GETGEO has it's own method for ages
drivers/block/cpqarray.c: better error handling and kmalloc + memset conversion to k[cz]alloc
drivers/block/cciss.c: kmalloc + memset conversion to kzalloc
Clean up duplicate includes in drivers/block/
Fix remap handling by blktrace
[PATCH] remove mm/filemap.c:file_send_actor()
Diffstat (limited to 'drivers/md/dm.c')
| -rw-r--r-- | drivers/md/dm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 141ff9f..2120155 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -580,8 +580,8 @@ static void __map_bio(struct dm_target *ti, struct bio *clone, /* the bio has been remapped so dispatch it */ blk_add_trace_remap(bdev_get_queue(clone->bi_bdev), clone, - tio->io->bio->bi_bdev->bd_dev, sector, - clone->bi_sector); + tio->io->bio->bi_bdev->bd_dev, + clone->bi_sector, sector); generic_make_request(clone); } else if (r < 0 || r == DM_MAPIO_REQUEUE) { |