Browse Source

scsi-ioctl: use clock_t <> jiffies

Convert the timeout ioctl scalling to use the clock_t functions
which are much more accurate with some USER_HZ vs HZ combinations.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Milton Miller 16 years ago
parent
commit
2b91bafcc0
1 changed files with 2 additions and 2 deletions
  1. 2 2
      block/scsi_ioctl.c

+ 2 - 2
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)
 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)
 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);
 	int timeout, err = get_user(timeout, p);
 
 
 	if (!err)
 	if (!err)
-		q->sg_timeout = timeout * (HZ / USER_HZ);
+		q->sg_timeout = clock_t_to_jiffies(timeout);
 
 
 	return err;
 	return err;
 }
 }