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

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index e423a16ba3c9..0302723fa21f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3460,9 +3460,9 @@ static int update_size(mddev_t *mddev, unsigned long size)
 
                 bdev = bdget_disk(mddev->gendisk, 0);
                 if (bdev) {
-                        down(&bdev->bd_inode->i_sem);
+                        mutex_lock(&bdev->bd_inode->i_mutex);
                         i_size_write(bdev->bd_inode, mddev->array_size << 10);
-                        up(&bdev->bd_inode->i_sem);
+                        mutex_unlock(&bdev->bd_inode->i_mutex);
                         bdput(bdev);
                 }
         }
@@ -3486,9 +3486,9 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks)
 
                 bdev = bdget_disk(mddev->gendisk, 0);
                 if (bdev) {
-                        down(&bdev->bd_inode->i_sem);
+                        mutex_lock(&bdev->bd_inode->i_mutex);
                         i_size_write(bdev->bd_inode, mddev->array_size << 10);
-                        up(&bdev->bd_inode->i_sem);
+                        mutex_unlock(&bdev->bd_inode->i_mutex);
                         bdput(bdev);
                 }
         }