From df2c6cd7834b66b0454f32791d5b7effdb8e885d Mon Sep 17 00:00:00 2001 From: Milton Miller Date: Mon, 17 Nov 2008 13:10:34 +0100 Subject: [PATCH] --- yaml --- r: 123275 b: refs/heads/master c: 2b91bafcc0fc545e489e9537a38f487706960ea5 h: refs/heads/master i: 123273: 85e7d8a617ec8abc0d68f2f043a36ac754d8383f 123271: c11a86228f58e1fc4de4c458806689ddcdde2906 v: v3 --- [refs] | 2 +- trunk/block/scsi_ioctl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dae986b68c7b..8a503965c745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70ed28b92a786f44750ab64117b03d126dd14656 +refs/heads/master: 2b91bafcc0fc545e489e9537a38f487706960ea5 diff --git a/trunk/block/scsi_ioctl.c b/trunk/block/scsi_ioctl.c index d0bb92cbefb9..ee9c67d7e1be 100644 --- a/trunk/block/scsi_ioctl.c +++ b/trunk/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; }