diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /fs/ufs | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'fs/ufs')
| -rw-r--r-- | fs/ufs/super.c | 2 | ||||
| -rw-r--r-- | fs/ufs/truncate.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index b6a1f8ef6..27d404ca1 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -935,7 +935,7 @@ static struct file_system_type ufs_fs_type = { NULL }; -__initfunc(int init_ufs_fs(void)) +int __init init_ufs_fs(void) { return register_filesystem(&ufs_fs_type); } diff --git a/fs/ufs/truncate.c b/fs/ufs/truncate.c index b7214fc49..99069517e 100644 --- a/fs/ufs/truncate.c +++ b/fs/ufs/truncate.c @@ -455,7 +455,8 @@ void ufs_truncate (struct inode * inode) break; if (IS_SYNC(inode) && (inode->i_state & I_DIRTY)) ufs_sync_inode (inode); - current->counter = 0; + run_task_queue(&tq_disk); + current->policy |= SCHED_YIELD; schedule (); |