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/ufs | |
| parent | d9d8062e7b49943b2a2fb034f817a9fc217fd40f (diff) | |
Merge with 2.4.0-test3-pre7.
Diffstat (limited to 'fs/ufs')
| -rw-r--r-- | fs/ufs/ialloc.c | 1 | ||||
| -rw-r--r-- | fs/ufs/inode.c | 9 | ||||
| -rw-r--r-- | fs/ufs/super.c | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index 3b7bf8410..f93a55c4e 100644 --- a/fs/ufs/ialloc.c +++ b/fs/ufs/ialloc.c @@ -101,6 +101,7 @@ void ufs_free_inode (struct inode * inode) is_directory = S_ISDIR(inode->i_mode); DQUOT_FREE_INODE(sb, inode); + DQUOT_DROP(inode); clear_inode (inode); diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index eb1d86d18..fffaa7d3e 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -747,7 +747,9 @@ static int ufs_update_inode(struct inode * inode, int do_sync) void ufs_write_inode (struct inode * inode, int wait) { + lock_kernel(); ufs_update_inode (inode, wait); + unlock_kernel(); } int ufs_sync_inode (struct inode *inode) @@ -755,18 +757,15 @@ int ufs_sync_inode (struct inode *inode) return ufs_update_inode (inode, 1); } -void ufs_put_inode (struct inode * inode) -{ - UFSD(("ENTER & EXIT\n")) -} - void ufs_delete_inode (struct inode * inode) { /*inode->u.ufs_i.i_dtime = CURRENT_TIME;*/ + lock_kernel(); mark_inode_dirty(inode); ufs_update_inode(inode, IS_SYNC(inode)); inode->i_size = 0; if (inode->i_blocks) ufs_truncate (inode); ufs_free_inode (inode); + unlock_kernel(); } diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 7784203e0..c41228adf 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -971,7 +971,6 @@ int ufs_statfs (struct super_block * sb, struct statfs * buf) static struct super_operations ufs_super_ops = { read_inode: ufs_read_inode, write_inode: ufs_write_inode, - put_inode: ufs_put_inode, delete_inode: ufs_delete_inode, put_super: ufs_put_super, write_super: ufs_write_super, |