diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 23:29:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 23:29:35 +0000 |
| commit | 35385d7a83b4cae6d5ea5f80f3b3377d94178344 (patch) | |
| tree | 49494d95dfef31ba4f9a697d31e4028cf65a57bd /fs/hpfs | |
| parent | d9d8062e7b49943b2a2fb034f817a9fc217fd40f (diff) | |
Merge with 2.4.0-test3-pre7.
Diffstat (limited to 'fs/hpfs')
| -rw-r--r-- | fs/hpfs/file.c | 5 | ||||
| -rw-r--r-- | fs/hpfs/inode.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index 4a301f593..f284e3d42 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c @@ -7,12 +7,17 @@ */ #include <linux/string.h> +#include <linux/sched.h> +#include <linux/smp_lock.h> #include "hpfs_fn.h" +/* HUH? */ int hpfs_open(struct inode *i, struct file *f) { + lock_kernel(); hpfs_lock_inode(i); hpfs_unlock_inode(i); /* make sure nobody is deleting the file */ + unlock_kernel(); if (!i->i_nlink) return -ENOENT; return 0; } diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c index 7938970c8..a9f085863 100644 --- a/fs/hpfs/inode.c +++ b/fs/hpfs/inode.c @@ -6,6 +6,8 @@ * inode VFS functions */ +#include <linux/sched.h> +#include <linux/smp_lock.h> #include "hpfs_fn.h" static struct file_operations hpfs_file_ops = @@ -313,6 +315,8 @@ void hpfs_write_if_changed(struct inode *inode) void hpfs_delete_inode(struct inode *inode) { + lock_kernel(); hpfs_remove_fnode(inode->i_sb, inode->i_ino); + unlock_kernel(); clear_inode(inode); } |