diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2010-02-26 00:20:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-26 13:58:08 +0100 |
| commit | 8a78362c4eefc1deddbefe2c7f38aabbc2429d6b (patch) | |
| tree | c095d95af1aec0f9cee5975b1dcdc6bc1d17d401 /drivers/scsi/st.c | |
| parent | 086fa5ff0854c676ec333760f4c0154b3b242616 (diff) | |
| download | op-kernel-dev-8a78362c4eefc1deddbefe2c7f38aabbc2429d6b.zip op-kernel-dev-8a78362c4eefc1deddbefe2c7f38aabbc2429d6b.tar.gz | |
block: Consolidate phys_segment and hw_segment limits
Except for SCSI no device drivers distinguish between physical and
hardware segment limits. Consolidate the two into a single segment
limit.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/scsi/st.c')
| -rw-r--r-- | drivers/scsi/st.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index d04ea9a..f67d1a1 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -3983,8 +3983,7 @@ static int st_probe(struct device *dev) return -ENODEV; } - i = min(queue_max_hw_segments(SDp->request_queue), - queue_max_phys_segments(SDp->request_queue)); + i = queue_max_segments(SDp->request_queue); if (st_max_sg_segs < i) i = st_max_sg_segs; buffer = new_tape_buffer((SDp->host)->unchecked_isa_dma, i); |
