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/jffs | |
| parent | d9d8062e7b49943b2a2fb034f817a9fc217fd40f (diff) | |
Merge with 2.4.0-test3-pre7.
Diffstat (limited to 'fs/jffs')
| -rw-r--r-- | fs/jffs/inode-v23.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c index fc9c7d0d2..e088d7fba 100644 --- a/fs/jffs/inode-v23.c +++ b/fs/jffs/inode-v23.c @@ -1453,7 +1453,8 @@ static struct inode_operations jffs_file_inode_operations = static struct file_operations jffs_dir_operations = { - readdir: jffs_readdir, + read: generic_read_dir, + readdir: jffs_readdir, }; static struct inode_operations jffs_dir_inode_operations = @@ -1532,9 +1533,9 @@ jffs_delete_inode(struct inode *inode) inode->i_size = 0; + unlock_kernel(); clear_inode(inode); - unlock_kernel(); } void |