Christoph, > Merge the ioctl handling in block/scsi_ioctl.c into its only caller in > drivers/scsi/scsi_ioctl.c. > +static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, > + struct sg_io_hdr *hdr, fmode_t mode) [...] > +static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, > + struct bio *bio) > +{ Another couple of peculiar naming vestiges. These probably shouldn't have a "blk_" prefix now that they are under SCSI. Since they are internal to scsi_ioctl.c I propose you either drop the prefix completely or make it "scsi_". -- Martin K. Petersen Oracle Linux Engineering