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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 5b2d18035073..704c3c07f0ab 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -741,7 +741,7 @@ static loff_t memory_lseek(struct file * file, loff_t offset, int orig)
 {
         loff_t ret;
 
-        down(&file->f_dentry->d_inode->i_sem);
+        mutex_lock(&file->f_dentry->d_inode->i_mutex);
         switch (orig) {
                 case 0:
                         file->f_pos = offset;
@@ -756,7 +756,7 @@ static loff_t memory_lseek(struct file * file, loff_t offset, int orig)
                 default:
                         ret = -EINVAL;
         }
-        up(&file->f_dentry->d_inode->i_sem);
+        mutex_unlock(&file->f_dentry->d_inode->i_mutex);
         return ret;
 }