From 126624c98629fbb26aa21fa912e9f3acc8f0c093 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 2 Feb 2006 14:28:03 -0800 Subject: [PATCH] --- yaml --- r: 19599 b: refs/heads/master c: 6d89332b776fc11bac0073209e44ec8f39831e4e h: refs/heads/master i: 19597: f5392ba38eabd8851333577766044ec33efa7533 19595: 96882fd501a958e6a8b70191b60c724412b8a051 19591: b9be49481904a3868ef393a963c57cadde871320 19583: f695cbe9ff0fd5e820214a00eb435d1aecbc9492 v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index ca9b51243964..d1f542a80c81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf41f8ac386e8d62122e7e394b4c6b3e3ab30ede +refs/heads/master: 6d89332b776fc11bac0073209e44ec8f39831e4e diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 7145cd150f7b..9fac8ac496c5 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -3465,7 +3465,7 @@ static int update_size(mddev_t *mddev, unsigned long size) bdev = bdget_disk(mddev->gendisk, 0); if (bdev) { mutex_lock(&bdev->bd_inode->i_mutex); - i_size_write(bdev->bd_inode, mddev->array_size << 10); + i_size_write(bdev->bd_inode, (loff_t)mddev->array_size << 10); mutex_unlock(&bdev->bd_inode->i_mutex); bdput(bdev); } @@ -3485,17 +3485,6 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks) if (mddev->sync_thread) return -EBUSY; rv = mddev->pers->reshape(mddev, raid_disks); - if (!rv) { - struct block_device *bdev; - - bdev = bdget_disk(mddev->gendisk, 0); - if (bdev) { - mutex_lock(&bdev->bd_inode->i_mutex); - i_size_write(bdev->bd_inode, mddev->array_size << 10); - mutex_unlock(&bdev->bd_inode->i_mutex); - bdput(bdev); - } - } return rv; }