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

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index eef1b81aa294..db0de5c621c7 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -729,13 +729,13 @@ static int fat_dir_ioctl(struct inode * inode, struct file * filp,
 
         buf.dirent = d1;
         buf.result = 0;
-        down(&inode->i_sem);
+        mutex_lock(&inode->i_mutex);
         ret = -ENOENT;
         if (!IS_DEADDIR(inode)) {
                 ret = __fat_readdir(inode, filp, &buf, fat_ioctl_filldir,
                                     short_only, both);
         }
-        up(&inode->i_sem);
+        mutex_unlock(&inode->i_mutex);
         if (ret >= 0)
                 ret = buf.result;
         return ret;