Commit:     9793c3266755b4cae8915982825b2c07cd12e1c6
Parent:     959bc220df38317bed9a677600b3945a8571fc1c
Author:     S.Çağlar Onur <[EMAIL PROTECTED]>
AuthorDate: Mon Jul 16 21:56:51 2007 +0300
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jul 16 12:11:27 2007 -0700

    Fix too few arguments to function `scsi_cmd_ioctl'
    This corrects the following compile error introduced by the merge of the
    new bsg layer in commit e245befce7af0a1e1347079ed62695b059594bd4:
      [EMAIL PROTECTED] linux-2.6 $ make
        CHK     include/linux/version.h
        CHK     include/linux/utsrelease.h
        CALL    scripts/
        CHK     include/linux/compile.h
        LD      drivers/block/built-in.o
        CC [M]  drivers/block/cciss.o
      drivers/block/cciss.c: In function `cciss_ioctl':
      drivers/block/cciss.c:1173: warning: passing arg 2 of `scsi_cmd_ioctl' 
from incompatible pointer type
      drivers/block/cciss.c:1173: warning: passing arg 3 of `scsi_cmd_ioctl' 
makes pointer from integer without a cast
      drivers/block/cciss.c:1173: warning: passing arg 4 of `scsi_cmd_ioctl' 
makes integer from pointer without a cast
      drivers/block/cciss.c:1173: error: too few arguments to function 
      make[2]: *** [drivers/block/cciss.o] Hata 1
      make[1]: *** [drivers/block] Hata 2
      make: *** [drivers] Hata 2
    Signed-off-by: S.Çağlar Onur <[EMAIL PROTECTED]>
    Cc: Jens Axboe <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/block/cciss.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 0fcad43..a2d6612 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1170,7 +1170,7 @@ static int cciss_ioctl(struct inode *inode, struct file 
        case SG_EMULATED_HOST:
        case SG_IO:
-               return scsi_cmd_ioctl(filep, disk, cmd, argp);
+               return scsi_cmd_ioctl(filep, disk->queue, disk, cmd, argp);
        /* scsi_cmd_ioctl would normally handle these, below, but */
        /* they aren't a good fit for cciss, as CD-ROMs are */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to