scsi-ioctl: use clock_t <> jiffies

[pandora-kernel.git] / block / scsi_ioctl.c

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index d0bb92c..ee9c67d 100644 (file)
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -60,7 +60,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
 
 static int sg_get_timeout(struct request_queue *q)
 {
-       return q->sg_timeout / (HZ / USER_HZ);
+       return jiffies_to_clock_t(q->sg_timeout);
 }
 
 static int sg_set_timeout(struct request_queue *q, int __user *p)
@@ -68,7 +68,7 @@ static int sg_set_timeout(struct request_queue *q, int __user *p)
        int timeout, err = get_user(timeout, p);
 
        if (!err)
-               q->sg_timeout = timeout * (HZ / USER_HZ);
+               q->sg_timeout = clock_t_to_jiffies(timeout);
 
        return err;
 }