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

1 files changed, 2 insertions, 2 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;
 }