as-iosched: fix double locking bug in as_merged_requests()
Jens Axboe authored

If the two requests belong to the same io context, we will attempt
to lock the same lock twice. But swapping contexts is pointless in
that case, so just check for rioc == nioc before doing the double
lock and copy.
Tested-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
149a051f
Name Last commit Last update
..
Kconfig Only enable BLOCK_COMPAT if COMPAT is needed
Kconfig.iosched update I/O sched Kconfig help texts - CFQ is now default, not AS.
Makefile block: ll_rw_blk.c split, add blk-merge.c
as-iosched.c as-iosched: fix double locking bug in as_merged_requests()
blk-barrier.c block: continue ll_rw_blk.c splitup
blk-core.c block: ll_rw_blk.c split, add blk-merge.c
blk-exec.c block: continue ll_rw_blk.c splitup
blk-ioc.c block: continue ll_rw_blk.c splitup
blk-map.c block: continue ll_rw_blk.c splitup
blk-merge.c block: ll_rw_blk.c split, add blk-merge.c
blk-settings.c block: continue ll_rw_blk.c splitup
blk-sysfs.c Expose hardware sector size
blk-tag.c block: split tag and sysfs handling from blk-core.c
blk.h block: ll_rw_blk.c split, add blk-merge.c
blktrace.c blktrace: Add blktrace ioctls to SCSI generic devices
bsg.c [SCSI] libsas, bsg: pass errors through correctly
cfq-iosched.c cfq-iosched: kill some big inlines
compat_ioctl.c blktrace: Add blktrace ioctls to SCSI generic devices
deadline-iosched.c block: let elv_register() return void
elevator.c block: implement drain buffers
genhd.c block: constify function pointer tables
ioctl.c compat_ioctl: move common block ioctls to compat_blkdev_ioctl
noop-iosched.c block: let elv_register() return void
scsi_ioctl.c block: use jiffies conversion functions in scsi_ioctl.c