diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
| commit | f1da2c3860e301527d56a1ef0b56c649ee7c4b1b (patch) | |
| tree | 562b5d2e8b9cb62eb983d78ff6bcf9789e08fcf6 /fs/hpfs | |
| parent | 00f11569ac8ca73cbcdef8822de1583e79aee571 (diff) | |
Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.
The IP22 cache bugs which are plaguing some machines are still unfixed.
Diffstat (limited to 'fs/hpfs')
| -rw-r--r-- | fs/hpfs/dir.c | 4 | ||||
| -rw-r--r-- | fs/hpfs/file.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/fs/hpfs/dir.c b/fs/hpfs/dir.c index 51d519d7f..15db6e936 100644 --- a/fs/hpfs/dir.c +++ b/fs/hpfs/dir.c @@ -7,11 +7,15 @@ */ #include "hpfs_fn.h" +#include <linux/sched.h> +#include <linux/smp_lock.h> int hpfs_dir_release(struct inode *inode, struct file *filp) { + lock_kernel(); hpfs_del_pos(inode, &filp->f_pos); /*hpfs_write_if_changed(inode);*/ + unlock_kernel(); return 0; } diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index f284e3d42..fb5f566e7 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c @@ -24,7 +24,9 @@ int hpfs_open(struct inode *i, struct file *f) int hpfs_file_release(struct inode *inode, struct file *file) { + lock_kernel(); hpfs_write_if_changed(inode); + unlock_kernel(); return 0; } |