2015-07-20 23:30:06

by Spencer Baugh

Subject: [PATCH 1/2] target: remove unused lun_flags field from se_lun

From: Spencer Baugh <[email protected]>

From: Chris Zankel <[email protected]>

The lun_flags field is not used, so drop it.

Signed-off-by: Chris Zankel <[email protected]>
---
include/target/target_core_base.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 17ae2d6..0a7c44e 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -685,7 +685,6 @@ struct se_lun {
#define SE_LUN_LINK_MAGIC 0xffff7771
u32 lun_link_magic;
u32 lun_access;
- u32 lun_flags;
u32 lun_index;

/* RELATIVE TARGET PORT IDENTIFER */
--
2.4.3

2015-07-20 23:30:08

by Spencer Baugh

Subject: [PATCH 2/2] target: remove initiatorname field in se_acl_lun

From: Spencer Baugh <[email protected]>

From: Chris Zankel <[email protected]>

The initiatorname field in se_acl_lun is only a copy of the same field
in se_node_acl, so remove it and use the version in se_node_acl where
needed (it's actually only used for pr_debug)

Signed-off-by: Chris Zankel <[email protected]>
---
drivers/target/target_core_device.c | 8 +++-----
drivers/target/target_core_fabric_configfs.c | 2 +-
include/target/target_core_base.h | 1 -
3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 09e682b..c4a8db6 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -620,8 +620,6 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(

lacl->mapped_lun = mapped_lun;
lacl->se_lun_nacl = nacl;
- snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s",
- nacl->initiatorname);

return lacl;
}
@@ -656,7 +654,7 @@ int core_dev_add_initiator_node_lun_acl(
" InitiatorNode: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun, lacl->mapped_lun,
(lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) ? "RW" : "RO",
- lacl->initiatorname);
+ nacl->initiatorname);
/*
* Check to see if there are any existing persistent reservation APTPL
* pre-registrations that need to be enabled for this LUN ACL..
@@ -688,7 +686,7 @@ int core_dev_del_initiator_node_lun_acl(
" InitiatorNode: %s Mapped LUN: %llu\n",
tpg->se_tpg_tfo->get_fabric_name(),
tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
- lacl->initiatorname, lacl->mapped_lun);
+ nacl->initiatorname, lacl->mapped_lun);

return 0;
}
@@ -701,7 +699,7 @@ void core_dev_free_initiator_node_lun_acl(
" Mapped LUN: %llu\n", tpg->se_tpg_tfo->get_fabric_name(),
tpg->se_tpg_tfo->tpg_get_tag(tpg),
tpg->se_tpg_tfo->get_fabric_name(),
- lacl->initiatorname, lacl->mapped_lun);
+ lacl->se_lun_nacl->initiatorname, lacl->mapped_lun);

kfree(lacl);
}
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 48a3698..be42429 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -203,7 +203,7 @@ static ssize_t target_fabric_mappedlun_store_write_protect(
pr_debug("%s_ConfigFS: Changed Initiator ACL: %s"
" Mapped LUN: %llu Write Protect bit to %s\n",
se_tpg->se_tpg_tfo->get_fabric_name(),
- lacl->initiatorname, lacl->mapped_lun, (op) ? "ON" : "OFF");
+ se_nacl->initiatorname, lacl->mapped_lun, (op) ? "ON" : "OFF");

return count;

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 0a7c44e..b59b61a 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -598,7 +598,6 @@ struct se_ml_stat_grps {
};

struct se_lun_acl {
- char initiatorname[TRANSPORT_IQN_LEN];
u64 mapped_lun;
struct se_node_acl *se_lun_nacl;
struct se_lun *se_lun;
--
2.4.3

2015-07-21 13:40:51

by Christoph Hellwig

Subject: Re: [PATCH 1/2] target: remove unused lun_flags field from se_lun

Looks good,

but what's up with your From lines:

On Mon, Jul 20, 2015 at 04:29:49PM -0700, Spencer Baugh wrote:
> From: Spencer Baugh <[email protected]>
>
> From: Chris Zankel <[email protected]>

plus another address for you in the actual email From line. Who
did actually write this patch?

2015-07-21 13:41:12

by Christoph Hellwig

Subject: Re: [PATCH 2/2] target: remove initiatorname field in se_acl_lun

Looks good too, but same From: issue as the last patch.

2015-07-21 17:03:36

by Spencer Baugh

Subject: Re: [PATCH 1/2] target: remove unused lun_flags field from se_lun

Christoph Hellwig <[email protected]> writes:

> Looks good,
>
> but what's up with your From lines:
>
> On Mon, Jul 20, 2015 at 04:29:49PM -0700, Spencer Baugh wrote:
>> From: Spencer Baugh <[email protected]>
>>
>> From: Chris Zankel <[email protected]>
>
> plus another address for you in the actual email From line. Who
> did actually write this patch?

Sorry, ignore the first From: line; the correct one is
From: Chris Zankel <[email protected]>
for both patches