diff --git a/[refs] b/[refs] index 607062f83566..93593773306a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5380a101d33d1d3a32c6b6bd2e17e5dd835842b0 +refs/heads/master: ff7d145fd911266ae42af7552edc32681c01addb diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h index 55ef6efe3eb5..d2dc17151f6c 100644 --- a/trunk/include/linux/blkdev.h +++ b/trunk/include/linux/blkdev.h @@ -232,7 +232,13 @@ struct request { struct hlist_node hash; /* merge hash */ struct rb_node rb_node; /* sort/lookup */ + /* + * two pointers are available for the IO schedulers, if they need + * more they have to dynamically allocate it. + */ void *elevator_private; + void *elevator_private2; + void *completion_data; int rq_status; /* should split this into a few status bits */