[PATCH] fuse: add request interruption

[linux-2.6] / fs / hpfs / inode.c

diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index 38b1741fa539f8a5ed060a72ee93bafcf2281e28..56f2c338c4d9a1b9a9639447ae7b23666079b461 100644 (file)
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c
@@ -186,9 +186,9 @@ void hpfs_write_inode(struct inode *i)
                kfree(hpfs_inode->i_rddir_off);
                hpfs_inode->i_rddir_off = NULL;
        }
-       down(&hpfs_inode->i_parent);
+       mutex_lock(&hpfs_inode->i_parent_mutex);
        if (!i->i_nlink) {
-               up(&hpfs_inode->i_parent);
+               mutex_unlock(&hpfs_inode->i_parent_mutex);
                return;
        }
        parent = iget_locked(i->i_sb, hpfs_inode->i_parent_dir);
@@ -199,14 +199,14 @@ void hpfs_write_inode(struct inode *i)
                        hpfs_read_inode(parent);
                        unlock_new_inode(parent);
                }
-               down(&hpfs_inode->i_sem);
+               mutex_lock(&hpfs_inode->i_mutex);
                hpfs_write_inode_nolock(i);
-               up(&hpfs_inode->i_sem);
+               mutex_unlock(&hpfs_inode->i_mutex);
                iput(parent);
        } else {
                mark_inode_dirty(i);
        }
-       up(&hpfs_inode->i_parent);
+       mutex_unlock(&hpfs_inode->i_parent_mutex);
 }
 
 void hpfs_write_inode_nolock(struct inode *i)
@@ -284,6 +284,7 @@ void hpfs_write_if_changed(struct inode *inode)
 
 void hpfs_delete_inode(struct inode *inode)
 {
+       truncate_inode_pages(&inode->i_data, 0);
        lock_kernel();
        hpfs_remove_fnode(inode->i_sb, inode->i_ino);
        unlock_kernel();