diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-21 10:24:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-21 10:24:02 -0700 |
| commit | ae298c98e5ab5bab3b39ffe0c2aebfeb4b1e68a2 (patch) | |
| tree | c7d5775c294b98301fdc726395dfb37d9878461d /block | |
| parent | da547d775fa9ba8d9dcaee7bc4e960540e2be576 (diff) | |
| parent | be33c3a67bb717508ab1eab0f2fa570fabcbc4d2 (diff) | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'block')
| -rw-r--r-- | block/cfq-iosched.c | 2 | ||||
| -rw-r--r-- | block/ll_rw_blk.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index aae3123bf3e..3a3aee08ec5 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1561,7 +1561,7 @@ restart: /* ->key must be copied to avoid race with cfq_exit_queue() */ k = __cic->key; if (unlikely(!k)) { - cfq_drop_dead_cic(ioc, cic); + cfq_drop_dead_cic(ioc, __cic); goto restart; } diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 61d6b3c65b6..ddd9253f9d5 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -3628,6 +3628,8 @@ struct io_context *current_io_context(gfp_t gfp_flags) ret->nr_batch_requests = 0; /* because this is 0 */ ret->aic = NULL; ret->cic_root.rb_node = NULL; + /* make sure set_task_ioprio() sees the settings above */ + smp_wmb(); tsk->io_context = ret; } |