diff --git a/[refs] b/[refs]
index 59f5979a8e4f..843412f1f903 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3cc86c2f00839453d2dbeb46bfc44e885b073db
+refs/heads/master: d646a02a9d44d1421f273ae3923d97b47b918176
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index 172f8491a2bd..82b7c9ad29ac 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/fs/block_dev.c
@@ -1032,7 +1032,9 @@ void bd_set_size(struct block_device *bdev, loff_t size)
 {
 	unsigned bsize = bdev_logical_block_size(bdev);
 
-	bdev->bd_inode->i_size = size;
+	mutex_lock(&bdev->bd_inode->i_mutex);
+	i_size_write(bdev->bd_inode, size);
+	mutex_unlock(&bdev->bd_inode->i_mutex);
 	while (bsize < PAGE_CACHE_SIZE) {
 		if (size & bsize)
 			break;