[Bluetooth] Integrate low-level connections into the driver model

[pandora-kernel.git] / fs / hpfs / inode.c

diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index e3d17e9..bcf6ee3 100644 (file)
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c
@@ -17,7 +17,6 @@ void hpfs_init_inode(struct inode *i)
        i->i_gid = hpfs_sb(sb)->sb_gid;
        i->i_mode = hpfs_sb(sb)->sb_mode;
        hpfs_inode->i_conv = hpfs_sb(sb)->sb_conv;
-       i->i_blksize = 512;
        i->i_size = -1;
        i->i_blocks = -1;
        
@@ -186,9 +185,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 +198,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)