Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cfq' into for-linus

Browse source
This commit is contained in:
Jens Axboe 2007-04-30 09:09:27 +02:00
commit 07e4470805
3 changed files with 455 additions and 432 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

885
block/cfq-iosched.c
View file

File diff suppressed because it is too large Load diff

1
block/ll_rw_blk.c
View file

@ -3741,6 +3741,7 @@ static struct io_context *current_io_context(gfp_t gfp_flags, int node)
ret->nr_batch_requests = 0; /* because this is 0 */ ret->nr_batch_requests = 0; /* because this is 0 */
ret->aic = NULL; ret->aic = NULL;
ret->cic_root.rb_node = NULL; ret->cic_root.rb_node = NULL;
ret->ioc_data = NULL;
/* make sure set_task_ioprio() sees the settings above */ /* make sure set_task_ioprio() sees the settings above */
smp_wmb(); smp_wmb();
tsk->io_context = ret; tsk->io_context = ret;

1
include/linux/blkdev.h
View file

@ -116,6 +116,7 @@ struct io_context {
struct as_io_context *aic; struct as_io_context *aic;
struct rb_root cic_root; struct rb_root cic_root;
void *ioc_data;
}; };
void put_io_context(struct io_context *ioc); void put_io_context(struct io_context *ioc);