[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.4 V2 3/9] block/iscsi: rename iscsi_write_prot
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCH for-2.4 V2 3/9] block/iscsi: rename iscsi_write_protected and let it return void |
Date: |
Thu, 16 Apr 2015 16:08:27 +0200 |
Signed-off-by: Peter Lieven <address@hidden>
---
block/iscsi.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 6cf7e99..221c9fc 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1253,11 +1253,11 @@ static void iscsi_attach_aio_context(BlockDriverState
*bs,
iscsi_timed_set_events, iscsilun);
}
-static bool iscsi_is_write_protected(IscsiLun *iscsilun)
+static void iscsi_modesense_sync(IscsiLun *iscsilun)
{
struct scsi_task *task;
struct scsi_mode_sense *ms = NULL;
- bool wrprotected = false;
+ iscsilun->write_protected = false;
task = iscsi_modesense6_sync(iscsilun->iscsi, iscsilun->lun,
1, SCSI_MODESENSE_PC_CURRENT,
@@ -1278,13 +1278,12 @@ static bool iscsi_is_write_protected(IscsiLun *iscsilun)
iscsi_get_error(iscsilun->iscsi));
goto out;
}
- wrprotected = ms->device_specific_parameter & 0x80;
+ iscsilun->write_protected = ms->device_specific_parameter & 0x80;
out:
if (task) {
scsi_free_scsi_task(task);
}
- return wrprotected;
}
/*
@@ -1403,7 +1402,8 @@ static int iscsi_open(BlockDriverState *bs, QDict
*options, int flags,
scsi_free_scsi_task(task);
task = NULL;
- iscsilun->write_protected = iscsi_is_write_protected(iscsilun);
+ iscsi_modesense_sync(iscsilun);
+
/* Check the write protect flag of the LUN if we want to write */
if (iscsilun->type == TYPE_DISK && (flags & BDRV_O_RDWR) &&
iscsilun->write_protected) {
--
1.9.1
- [Qemu-devel] [PATCH for-2.4 V2 0/9] various improvements for the iSCSI driver, Peter Lieven, 2015/04/16
- [Qemu-devel] [PATCH for-2.4 V2 4/9] block/iscsi: store DPOFUA bit from the modesense command, Peter Lieven, 2015/04/16
- [Qemu-devel] [PATCH for-2.4 V2 2/9] block/iscsi: change all iscsilun properties from uint8_t to bool, Peter Lieven, 2015/04/16
- [Qemu-devel] [PATCH for-2.4 V2 3/9] block/iscsi: rename iscsi_write_protected and let it return void,
Peter Lieven <=
- [Qemu-devel] [PATCH for-2.4 V2 1/9] block/iscsi: do not forget to logout from target, Peter Lieven, 2015/04/16
- [Qemu-devel] [PATCH for-2.4 V2 8/9] block/iscsi: bump year in copyright notice, Peter Lieven, 2015/04/16
- [Qemu-devel] [PATCH for-2.4 V2 5/9] block/iscsi: optimize WRITE10/16 if cache.writeback is not set, Peter Lieven, 2015/04/16
- [Qemu-devel] [PATCH for-2.4 V2 9/9] block/iscsi: use the allocationmap also if cache.direct=on, Peter Lieven, 2015/04/16
- [Qemu-devel] [PATCH for-2.4 V2 6/9] block/iscsi: increase retry count, Peter Lieven, 2015/04/16
- [Qemu-devel] [PATCH for-2.4 V2 7/9] block/iscsi: handle SCSI_STATUS_TASK_SET_FULL, Peter Lieven, 2015/04/16
- Re: [Qemu-devel] [Qemu-block] [PATCH for-2.4 V2 0/9] various improvements for the iSCSI driver, Stefan Hajnoczi, 2015/04/23