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

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index e0df94c37b7e..6e50346fb1ee 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -202,7 +202,7 @@ static loff_t block_llseek(struct file *file, loff_t offset, int origin)
         loff_t size;
         loff_t retval;
 
-        down(&bd_inode->i_sem);
+        mutex_lock(&bd_inode->i_mutex);
         size = i_size_read(bd_inode);
 
         switch (origin) {
@@ -219,7 +219,7 @@ static loff_t block_llseek(struct file *file, loff_t offset, int origin)
                 }
                 retval = offset;
         }
-        up(&bd_inode->i_sem);
+        mutex_unlock(&bd_inode->i_mutex);
         return retval;
 }