From: Hannes Reinecke <hare@suse.de>
To: Christophe Varoqui <christophe.varoqui@gmail.com>
Cc: dm-devel@redhat.com
Subject: [PATCH 13/13] Rename variables in sysfs_get_tgt_nodename
Date: Wed, 16 Jan 2013 13:14:16 +0100 [thread overview]
Message-ID: <1358338456-1234-14-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1358338456-1234-1-git-send-email-hare@suse.de>
For consistency.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
libmultipath/discovery.c | 54 +++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 65f9c57..3fbc181 100644
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -205,9 +205,9 @@ sysfs_get_timeout(struct path *pp, unsigned int *timeout)
int
sysfs_get_tgt_nodename (struct path *pp, char * node)
{
- const char *targetid, *value;
+ const char *tgtname, *value;
struct udev_device *parent, *tgtdev;
- int host, channel, rport_id = -1, ata_id = -1;
+ int host, channel, tgtid = -1;
parent = udev_device_get_parent_with_subsystem_devtype(pp->udev, "scsi", "scsi_device");
if (!parent)
@@ -217,16 +217,16 @@ sysfs_get_tgt_nodename (struct path *pp, char * node)
if (value) {
tgtdev = udev_device_get_parent(parent);
while (tgtdev) {
- targetid = udev_device_get_sysname(tgtdev);
- if (sscanf(targetid, "end_device-%d:%d",
- &host, &rport_id) == 2)
+ tgtname = udev_device_get_sysname(tgtdev);
+ if (sscanf(tgtname, "end_device-%d:%d",
+ &host, &tgtid) == 2)
break;
tgtdev = udev_device_get_parent(tgtdev);
- rport_id = -1;
+ tgtid = -1;
}
- if (rport_id >= 0) {
+ if (tgtid >= 0) {
pp->sg_id.proto_id = SCSI_PROTOCOL_SAS;
- pp->sg_id.transport_id = rport_id;
+ pp->sg_id.transport_id = tgtid;
strncpy(node, value, NODE_NAME_SIZE);
return 0;
}
@@ -239,7 +239,7 @@ sysfs_get_tgt_nodename (struct path *pp, char * node)
tgtdev = udev_device_get_parent(parent);
value = udev_device_get_sysname(tgtdev);
if (sscanf(value, "rport-%d:%d-%d",
- &host, &channel, &rport_id) == 3) {
+ &host, &channel, &tgtid) == 3) {
tgtdev = udev_device_new_from_subsystem_sysname(conf->udev,
"fc_remote_ports", value);
if (tgtdev) {
@@ -247,12 +247,12 @@ sysfs_get_tgt_nodename (struct path *pp, char * node)
"FC rport %d:%d-%d",
pp->sg_id.host_no, pp->sg_id.channel,
pp->sg_id.scsi_id, host, channel,
- rport_id);
+ tgtid);
value = udev_device_get_sysattr_value(tgtdev,
"node_name");
if (value) {
pp->sg_id.proto_id = SCSI_PROTOCOL_FCP;
- pp->sg_id.transport_id = rport_id;
+ pp->sg_id.transport_id = tgtid;
strncpy(node, value, NODE_NAME_SIZE);
udev_device_unref(tgtdev);
return 0;
@@ -263,25 +263,25 @@ sysfs_get_tgt_nodename (struct path *pp, char * node)
/* Check for iSCSI */
parent = pp->udev;
- targetid = NULL;
+ tgtname = NULL;
while (parent) {
- targetid = udev_device_get_sysname(parent);
- if (targetid && sscanf(targetid , "session%d", &rport_id) == 1)
+ tgtname = udev_device_get_sysname(parent);
+ if (tgtname && sscanf(tgtname , "session%d", &tgtid) == 1)
break;
parent = udev_device_get_parent(parent);
- targetid = NULL;
- rport_id = -1;
+ tgtname = NULL;
+ tgtid = -1;
}
- if (parent && targetid) {
+ if (parent && tgtname) {
tgtdev = udev_device_new_from_subsystem_sysname(conf->udev,
- "iscsi_session", targetid);
+ "iscsi_session", tgtname);
if (tgtdev) {
const char *value;
- value = udev_device_get_sysattr_value(tgtdev, "targetname");
+ value = udev_device_get_sysattr_value(tgtdev, "tgtname");
if (value) {
pp->sg_id.proto_id = SCSI_PROTOCOL_ISCSI;
- pp->sg_id.transport_id = rport_id;
+ pp->sg_id.transport_id = tgtid;
strncpy(node, value, NODE_NAME_SIZE);
udev_device_unref(tgtdev);
return 0;
@@ -292,18 +292,18 @@ sysfs_get_tgt_nodename (struct path *pp, char * node)
}
/* Check for libata */
parent = pp->udev;
- targetid = NULL;
+ tgtname = NULL;
while (parent) {
- targetid = udev_device_get_sysname(parent);
- if (targetid && sscanf(targetid, "ata%d", &ata_id) == 1)
+ tgtname = udev_device_get_sysname(parent);
+ if (tgtname && sscanf(tgtname, "ata%d", &tgtid) == 1)
break;
parent = udev_device_get_parent(parent);
- targetid = NULL;
+ tgtname = NULL;
}
- if (targetid) {
+ if (tgtname) {
pp->sg_id.proto_id = SCSI_PROTOCOL_ATA;
- pp->sg_id.transport_id = ata_id;
- snprintf(node, NODE_NAME_SIZE, "ata-%d.00", ata_id);
+ pp->sg_id.transport_id = tgtid;
+ snprintf(node, NODE_NAME_SIZE, "ata-%d.00", tgtid);
return 0;
}
pp->sg_id.proto_id = SCSI_PROTOCOL_UNSPEC;
--
1.7.4.2
next prev parent reply other threads:[~2013-01-16 12:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-16 12:14 [PATCH 00/13] More patches from SLES Hannes Reinecke
2013-01-16 12:14 ` [PATCH 01/13] Fixup .gitignore Hannes Reinecke
2013-01-16 12:14 ` [PATCH 02/13] Check for !SUSPENDED in kpartx rules Hannes Reinecke
2013-01-16 12:14 ` [PATCH 03/13] kpartx.rules: Check for accessible device-mapper device Hannes Reinecke
2013-01-16 12:14 ` [PATCH 04/13] Correct persistent symlink for cciss Hannes Reinecke
2013-01-16 12:14 ` [PATCH 05/13] Add hardware entry for Intel Multi-Flex Hannes Reinecke
2013-01-16 12:14 ` [PATCH 06/13] Add Datacore SANSymphony to hwtable Hannes Reinecke
2013-01-16 20:53 ` Christophe Varoqui
2013-01-16 12:14 ` [PATCH 07/13] Add SUN STK6580 to hardware table Hannes Reinecke
2013-01-16 12:14 ` [PATCH 08/13] Remove unused structures Hannes Reinecke
2013-01-16 12:14 ` [PATCH 09/13] Use transport identifiers when detecting devices Hannes Reinecke
2013-01-16 12:14 ` [PATCH 10/13] Discover target ids for ATA Hannes Reinecke
2013-01-16 12:14 ` [PATCH 11/13] Set recovery_tmo for iSCSI devices Hannes Reinecke
2013-01-16 12:14 ` [PATCH 12/13] Set I_T_nexus_loss_timeout on SAS devices Hannes Reinecke
2013-01-16 12:14 ` Hannes Reinecke [this message]
2013-01-16 21:06 ` [PATCH 00/13] More patches from SLES Christophe Varoqui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358338456-1234-14-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=christophe.varoqui@gmail.com \
--cc=dm-devel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox