Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123275
b: refs/heads/master
c: 2b91baf
h: refs/heads/master
i:
  123273: 85e7d8a
  123271: c11a862
v: v3
  • Loading branch information
Milton Miller authored and Jens Axboe committed Dec 29, 2008
1 parent 588bc66 commit df2c6cd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 70ed28b92a786f44750ab64117b03d126dd14656
refs/heads/master: 2b91bafcc0fc545e489e9537a38f487706960ea5
4 changes: 2 additions & 2 deletions trunk/block/scsi_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ 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)
{
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;
}
Expand Down

0 comments on commit df2c6cd

Please sign in to comment.