|
@@ -50,12 +50,21 @@ struct block_device *I_BDEV(struct inode *inode)
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(I_BDEV);
|
|
EXPORT_SYMBOL(I_BDEV);
|
|
|
|
|
|
-static void bdev_write_inode(struct inode *inode)
|
|
|
|
|
|
+static void bdev_write_inode(struct block_device *bdev)
|
|
{
|
|
{
|
|
|
|
+ struct inode *inode = bdev->bd_inode;
|
|
|
|
+ int ret;
|
|
|
|
+
|
|
spin_lock(&inode->i_lock);
|
|
spin_lock(&inode->i_lock);
|
|
while (inode->i_state & I_DIRTY) {
|
|
while (inode->i_state & I_DIRTY) {
|
|
spin_unlock(&inode->i_lock);
|
|
spin_unlock(&inode->i_lock);
|
|
- WARN_ON_ONCE(write_inode_now(inode, true));
|
|
|
|
|
|
+ ret = write_inode_now(inode, true);
|
|
|
|
+ if (ret) {
|
|
|
|
+ char name[BDEVNAME_SIZE];
|
|
|
|
+ pr_warn_ratelimited("VFS: Dirty inode writeback failed "
|
|
|
|
+ "for block device %s (err=%d).\n",
|
|
|
|
+ bdevname(bdev, name), ret);
|
|
|
|
+ }
|
|
spin_lock(&inode->i_lock);
|
|
spin_lock(&inode->i_lock);
|
|
}
|
|
}
|
|
spin_unlock(&inode->i_lock);
|
|
spin_unlock(&inode->i_lock);
|
|
@@ -1504,7 +1513,7 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
|
|
* ->release can cause the queue to disappear, so flush all
|
|
* ->release can cause the queue to disappear, so flush all
|
|
* dirty data before.
|
|
* dirty data before.
|
|
*/
|
|
*/
|
|
- bdev_write_inode(bdev->bd_inode);
|
|
|
|
|
|
+ bdev_write_inode(bdev);
|
|
}
|
|
}
|
|
if (bdev->bd_contains == bdev) {
|
|
if (bdev->bd_contains == bdev) {
|
|
if (disk->fops->release)
|
|
if (disk->fops->release)
|