Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6

2 files changed, 6 insertions, 6 deletions

diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 2391766e9c7c..8f1a517f8b4e 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -453,7 +453,7 @@ int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
         coda_vfs_stat.readdir++;
 
         host_inode = host_file->f_dentry->d_inode;
-        down(&host_inode->i_sem);
+        mutex_lock(&host_inode->i_mutex);
         host_file->f_pos = coda_file->f_pos;
 
         if (!host_file->f_op->readdir) {
@@ -475,7 +475,7 @@ int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
         }
 out:
         coda_file->f_pos = host_file->f_pos;
-        up(&host_inode->i_sem);
+        mutex_unlock(&host_inode->i_mutex);
 
         return ret;
 }
diff --git a/fs/coda/file.c b/fs/coda/file.c
index e6bc022568f3..30b4630bd735 100644
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -77,14 +77,14 @@ coda_file_write(struct file *coda_file, const char __user *buf, size_t count, lo
                 return -EINVAL;
 
         host_inode = host_file->f_dentry->d_inode;
-        down(&coda_inode->i_sem);
+        mutex_lock(&coda_inode->i_mutex);
 
         ret = host_file->f_op->write(host_file, buf, count, ppos);
 
         coda_inode->i_size = host_inode->i_size;
         coda_inode->i_blocks = (coda_inode->i_size + 511) >> 9;
         coda_inode->i_mtime = coda_inode->i_ctime = CURRENT_TIME_SEC;
-        up(&coda_inode->i_sem);
+        mutex_unlock(&coda_inode->i_mutex);
 
         return ret;
 }
@@ -272,9 +272,9 @@ int coda_fsync(struct file *coda_file, struct dentry *coda_dentry, int datasync)
         if (host_file->f_op && host_file->f_op->fsync) {
                 host_dentry = host_file->f_dentry;
                 host_inode = host_dentry->d_inode;
-                down(&host_inode->i_sem);
+                mutex_lock(&host_inode->i_mutex);
                 err = host_file->f_op->fsync(host_file, host_dentry, datasync);
-                up(&host_inode->i_sem);
+                mutex_unlock(&host_inode->i_mutex);
         }
 
         if ( !err && !datasync ) {