diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 07:49:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 07:49:28 -0700 |
| commit | cbf67812b2f1431c5e432ddecd202984c6882f2a (patch) | |
| tree | a6c6fc3d65fdababe7af31433038dcc32ec05ebb /include/linux | |
| parent | Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | compat_ioctl: fix block device compat ioctl regression (diff) | |
| download | linux-dev-cbf67812b2f1431c5e432ddecd202984c6882f2a.tar.xz linux-dev-cbf67812b2f1431c5e432ddecd202984c6882f2a.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
compat_ioctl: fix block device compat ioctl regression
[BLOCK] Fix bad sharing of tag busy list on queues with shared tag maps
Fix a build error when BLOCK=n
block: use lock bitops for the tag map.
cciss: update copyright notices
cfq_get_queue: fix possible NULL pointer access
blk_sync_queue() should cancel request_queue->unplug_work
cfq_exit_queue() should cancel cfq_data->unplug_work
block layer: remove a unused argument of drive_stat_acct()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index bbf906a0b419..8396db24d019 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -341,7 +341,6 @@ enum blk_queue_state { struct blk_queue_tag { struct request **tag_index; /* map of busy tags */ unsigned long *tag_map; /* bit map of free/busy tags */ - struct list_head busy_list; /* fifo list of busy tags */ int busy; /* current depth */ int max_depth; /* what we will send to device */ int real_max_depth; /* what the array can hold */ @@ -435,6 +434,7 @@ struct request_queue unsigned int dma_alignment; struct blk_queue_tag *queue_tags; + struct list_head tag_busy_list; unsigned int nr_sorted; unsigned int in_flight; |