diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 11:22:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 11:22:40 -0800 |
| commit | d5bee775137c56ed993f1b3c9d66c268b3525d7d (patch) | |
| tree | 3357ee75d4785f27e7c783f25f0478a23594b06a /include | |
| parent | 0827f2b698735aee7cfb2990d393a82f6e1690eb (diff) | |
| parent | fddfdeafa8396f85c666bfc5e1e920eb535514cf (diff) | |
| download | linux-d5bee775137c56ed993f1b3c9d66c268b3525d7d.tar.gz | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 6 | ||||
| -rw-r--r-- | include/scsi/scsi_host.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 02a585faa62cfd..860e7a485a5f08 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -392,8 +392,8 @@ struct request_queue unsigned int nr_congestion_off; unsigned int nr_batching; - unsigned short max_sectors; - unsigned short max_hw_sectors; + unsigned int max_sectors; + unsigned int max_hw_sectors; unsigned short max_phys_segments; unsigned short max_hw_segments; unsigned short hardsect_size; @@ -697,7 +697,7 @@ extern request_queue_t *blk_init_queue(request_fn_proc *, spinlock_t *); extern void blk_cleanup_queue(request_queue_t *); extern void blk_queue_make_request(request_queue_t *, make_request_fn *); extern void blk_queue_bounce_limit(request_queue_t *, u64); -extern void blk_queue_max_sectors(request_queue_t *, unsigned short); +extern void blk_queue_max_sectors(request_queue_t *, unsigned int); extern void blk_queue_max_phys_segments(request_queue_t *, unsigned short); extern void blk_queue_max_hw_segments(request_queue_t *, unsigned short); extern void blk_queue_max_segment_size(request_queue_t *, unsigned int); diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 467274a764d172..827992949c4bfe 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -554,7 +554,6 @@ struct Scsi_Host { /* * ordered write support */ - unsigned ordered_flush:1; unsigned ordered_tag:1; /* |