From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
Greetings folks,
This patch follows Jen's for-2.6.37/core branch merged as commit 35da7a307c535
to convert blkdev_issue_flush() to use the new 'sector_t error_sector' and
drop legacy BLKDEV_IFL_WAIT usage.
Signed-off-by: Nicholas A. Bellinger <nab@xxxxxxxxxxxxxxx>
---
drivers/target/target_core_iblock.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index e7840da..a8267a8 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -410,12 +410,14 @@ static unsigned long long iblock_emulate_read_cap_with_block_size(
static int __iblock_do_sync_cache(struct se_device *dev)
{
struct iblock_dev *ib_dev = (struct iblock_dev *)dev->dev_ptr;
+ sector_t error_sector;
int ret;
- ret = blkdev_issue_flush(ib_dev->ibd_bd, GFP_KERNEL, NULL,
- BLKDEV_IFL_WAIT);
+ ret = blkdev_issue_flush(ib_dev->ibd_bd, GFP_KERNEL, &error_sector);
if (ret != 0) {
- printk(KERN_ERR "IBLOCK: block_issue_flush() failed: %d\n", ret);
+ printk(KERN_ERR "IBLOCK: block_issue_flush() failed: %d "
+ " error_sector: %llu\n", ret,
+ (unsigned long long)error_sector);
return -1;
}
DEBUG_IBLOCK("IBLOCK: Called block_issue_flush()\n");
--
1.7.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
