hfs: push lock_super down

[deliverable/linux.git] / fs / hfs / inode.c

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 737dbeb64320744aa85f63e117298e6b33362618..f2deefdb406684c5f9b592deb580a3356100d946 100644 (file)
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -489,7 +489,7 @@ out:
 }
 
 static struct dentry *hfs_file_lookup(struct inode *dir, struct dentry *dentry,
-                                     struct nameidata *nd)
+                                     unsigned int flags)
 {
        struct inode *inode = NULL;
        hfs_cat_rec rec;
@@ -532,7 +532,7 @@ out:
 void hfs_evict_inode(struct inode *inode)
 {
        truncate_inode_pages(&inode->i_data, 0);
-       end_writeback(inode);
+       clear_inode(inode);
        if (HFS_IS_RSRC(inode) && HFS_I(inode)->rsrc_inode) {
                HFS_I(HFS_I(inode)->rsrc_inode)->rsrc_inode = NULL;
                iput(HFS_I(inode)->rsrc_inode);
@@ -645,11 +645,9 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end,
        /* sync the superblock to buffers */
        sb = inode->i_sb;
        if (sb->s_dirt) {
-               lock_super(sb);
                sb->s_dirt = 0;
                if (!(sb->s_flags & MS_RDONLY))
                        hfs_mdb_commit(sb);
-               unlock_super(sb);
        }
        /* .. finally sync the buffers to disk */
        err = sync_blockdev(sb->s_bdev);