linux/block, branch v2.6.18

elv_unregister: fix possible crash on module unload

2006-08-22T19:52:23Z

An exiting task or process which didn't do I/O yet have no io context, elv_unregister() should check it is not NULL. Signed-off-by: Oleg Nesterov Acked-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman

[PATCH] cfq_cic_link: fix usage of wrong cfq_io_context

2006-08-21T08:02:54Z

Obviously, cfq_cic_link() shouldn't free a just allocated cfq_io_context? The dead key is from __cic, so drop that. Signed-off-by: Oleg Nesterov Signed-off-by: Jens Axboe

[PATCH] Fix current_io_context() vs set_task_ioprio() race

2006-08-21T06:34:15Z

I know nothing about io scheduler, but I suspect set_task_ioprio() is not safe. current_io_context() initializes "struct io_context", then sets ->io_context. set_task_ioprio() running on another cpu may see the changes out of order, so ->set_ioprio(ioc) may use io_context which was not initialized properly. Signed-off-by: Oleg Nesterov Signed-off-by: Jens Axboe

[PATCH] cfq-iosched: don't use a hard jiffies value, translate from msecs

2006-07-25T13:05:21Z

The CIC_SEEKY() test really wants to use the minimum of either: - 2 msecs (not jiffies) - or, the pending slice time So code it like that. Signed-off-by: Jens Axboe

[PATCH] blktrace: fix read-ahead bit

2006-07-25T13:04:13Z

It should be toggling the same bit on and off, fix it up. Signed-off-by: Jens Axboe

[PATCH] lockdep: annotate the BLKPG_DEL_PARTITION ioctl

2006-07-15T04:53:53Z

The delete partition IOCTL takes the bd_mutex for both the disk and the partition; these have an obvious hierarchical relationship and this patch annotates this relationship for lockdep. Signed-off-by: Arjan van de Ven Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

[PATCH] Only the first two bits in bio->bi_rw and rq->flags match

2006-07-06T08:18:05Z

Not three, as assumed. This causes the barrier bit to be needlessly set for some IO. Signed-off-by: Jens Axboe

[PATCH] blktrace: readahead support

2006-07-06T08:03:28Z

Provide the needed kernel support for distinguishing readahead from regular read requests when tracing block devices. Signed-off-by: Nathan Scott Signed-off-by: Jens Axboe

[PATCH] lockdep: annotate on-stack completions

2006-07-03T22:27:09Z

lockdep needs to have the waitqueue lock initialized for on-stack waitqueues implicitly initialized by DECLARE_COMPLETION(). Annotate on-stack completions accordingly. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

2006-06-30T22:39:30Z

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: Remove obsolete #include remove obsolete swsusp_encrypt arch/arm26/Kconfig typos Documentation/IPMI typos Kconfig: Typos in net/sched/Kconfig v9fs: do not include linux/version.h Documentation/DocBook/mtdnand.tmpl: typo fixes typo fixes: specfic -> specific typo fixes in Documentation/networking/pktgen.txt typo fixes: occuring -> occurring typo fixes: infomation -> information typo fixes: disadvantadge -> disadvantage typo fixes: aquire -> acquire typo fixes: mecanism -> mechanism typo fixes: bandwith -> bandwidth fix a typo in the RTC_CLASS help text smb is no longer maintained Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S