diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/block/md.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/block/md.c')
| -rw-r--r-- | drivers/block/md.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/md.c b/drivers/block/md.c index b6cf3d34e..77090708e 100644 --- a/drivers/block/md.c +++ b/drivers/block/md.c @@ -696,7 +696,6 @@ static int md_ioctl (struct inode *inode, struct file *file, RO_IOCTLS(inode->i_rdev,arg); default: - printk ("Unknown md_ioctl %d\n", cmd); return -EINVAL; } @@ -1140,8 +1139,7 @@ int md_do_sync(struct md_dev *mddev) while (blocksize*j/(jiffies-starttime+1)*HZ/1024 > SPEED_LIMIT) { current->state = TASK_INTERRUPTIBLE; - current->timeout = jiffies+1; - schedule(); + schedule_timeout(1); } /* |