aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-07-09 06:38:05 -0400
committerJens Axboe <jens.axboe@oracle.com>2007-07-16 02:52:44 -0400
commit3d6392cfbd7dc11f23058e3493683afab4ac13a3 (patch)
tree70c2b65c479f5feb7a5214a4a4930d489a069b1f /drivers/ide
parent8f41958bdd577731f7411c9605cfaa9db6766809 (diff)
bsg: support for full generic block layer SG v3
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-floppy.c29
-rw-r--r--drivers/ide/ide.c10
2 files changed, 21 insertions, 18 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index f429be88c4f9..a21f585b1caa 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1258,19 +1258,25 @@ static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t
1258 set_bit(PC_DMA_RECOMMENDED, &pc->flags); 1258 set_bit(PC_DMA_RECOMMENDED, &pc->flags);
1259} 1259}
1260 1260
1261static int 1261static void
1262idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy, idefloppy_pc_t *pc, struct request *rq) 1262idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy, idefloppy_pc_t *pc, struct request *rq)
1263{ 1263{
1264 /*
1265 * just support eject for now, it would not be hard to make the
1266 * REQ_BLOCK_PC support fully-featured
1267 */
1268 if (rq->cmd[0] != IDEFLOPPY_START_STOP_CMD)
1269 return 1;
1270
1271 idefloppy_init_pc(pc); 1264 idefloppy_init_pc(pc);
1265 pc->callback = &idefloppy_rw_callback;
1272 memcpy(pc->c, rq->cmd, sizeof(pc->c)); 1266 memcpy(pc->c, rq->cmd, sizeof(pc->c));
1273 return 0; 1267 pc->rq = rq;
1268 pc->b_count = rq->data_len;
1269 if (rq->data_len && rq_data_dir(rq) == WRITE)
1270 set_bit(PC_WRITING, &pc->flags);
1271 pc->buffer = rq->data;
1272 if (rq->bio)
1273 set_bit(PC_DMA_RECOMMENDED, &pc->flags);
1274
1275 /*
1276 * possibly problematic, doesn't look like ide-floppy correctly
1277 * handled scattered requests if dma fails...
1278 */
1279 pc->request_transfer = pc->buffer_size = rq->data_len;
1274} 1280}
1275 1281
1276/* 1282/*
@@ -1317,10 +1323,7 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
1317 pc = (idefloppy_pc_t *) rq->buffer; 1323 pc = (idefloppy_pc_t *) rq->buffer;
1318 } else if (blk_pc_request(rq)) { 1324 } else if (blk_pc_request(rq)) {
1319 pc = idefloppy_next_pc_storage(drive); 1325 pc = idefloppy_next_pc_storage(drive);
1320 if (idefloppy_blockpc_cmd(floppy, pc, rq)) { 1326 idefloppy_blockpc_cmd(floppy, pc, rq);
1321 idefloppy_do_end_request(drive, 0, 0);
1322 return ide_stopped;
1323 }
1324 } else { 1327 } else {
1325 blk_dump_rq_flags(rq, 1328 blk_dump_rq_flags(rq,
1326 "ide-floppy: unsupported command in queue"); 1329 "ide-floppy: unsupported command in queue");
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index c948a5c17a5d..9ae60a7400a2 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1049,9 +1049,13 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
1049 unsigned long flags; 1049 unsigned long flags;
1050 ide_driver_t *drv; 1050 ide_driver_t *drv;
1051 void __user *p = (void __user *)arg; 1051 void __user *p = (void __user *)arg;
1052 int err = 0, (*setfunc)(ide_drive_t *, int); 1052 int err, (*setfunc)(ide_drive_t *, int);
1053 u8 *val; 1053 u8 *val;
1054 1054
1055 err = scsi_cmd_ioctl(file, bdev->bd_disk, cmd, p);
1056 if (err != -ENOTTY)
1057 return err;
1058
1055 switch (cmd) { 1059 switch (cmd) {
1056 case HDIO_GET_32BIT: val = &drive->io_32bit; goto read_val; 1060 case HDIO_GET_32BIT: val = &drive->io_32bit; goto read_val;
1057 case HDIO_GET_KEEPSETTINGS: val = &drive->keep_settings; goto read_val; 1061 case HDIO_GET_KEEPSETTINGS: val = &drive->keep_settings; goto read_val;
@@ -1171,10 +1175,6 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
1171 return 0; 1175 return 0;
1172 } 1176 }
1173 1177
1174 case CDROMEJECT:
1175 case CDROMCLOSETRAY:
1176 return scsi_cmd_ioctl(file, bdev->bd_disk, cmd, p);
1177
1178 case HDIO_GET_BUSSTATE: 1178 case HDIO_GET_BUSSTATE:
1179 if (!capable(CAP_SYS_ADMIN)) 1179 if (!capable(CAP_SYS_ADMIN))
1180 return -EACCES; 1180 return -EACCES;