* multipath-tools/libmultipath discovery.c
@ 2010-08-11 23:05 bmarzins
0 siblings, 0 replies; 9+ messages in thread
From: bmarzins @ 2010-08-11 23:05 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: multipath-tools
Branch: RHEL5_FC6
Changes by: bmarzins@sourceware.org 2010-08-11 23:05:50
Modified files:
libmultipath : discovery.c
Log message:
Fix for bz #576600
Patch to allow multipath to handle virtio devices. Mostly for testing purposes.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/discovery.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.32.2.14&r2=1.32.2.15
--- multipath-tools/libmultipath/discovery.c 2010/06/23 16:28:07 1.32.2.14
+++ multipath-tools/libmultipath/discovery.c 2010/08/11 23:05:50 1.32.2.15
@@ -481,6 +481,7 @@
char attr_path[FILE_NAME_SIZE];
char attr_buff[FILE_NAME_SIZE];
unsigned int unused;
+ char vdisk;
pp->bus = SYSFS_BUS_UNDEF;
@@ -489,6 +490,12 @@
strcpy(pp->product_id, "GNBD");
pp->hwe = find_hwe(conf->hwtable, pp->vendor_id, pp->product_id);
return 0;
+ } else if (sscanf(pp->dev, "vd%c", &vdisk) == 1 &&
+ 'a' <= vdisk && vdisk <= 'z'){
+ strcpy(pp->vendor_id, "VIRTIO");
+ strcpy(pp->product_id, "VIRTIO");
+ pp->hwe = find_hwe(conf->hwtable, pp->vendor_id, pp->product_id);
+ return 0;
}
/*
* This is ugly : we should be able to do a simple
^ permalink raw reply [flat|nested] 9+ messages in thread
* multipath-tools/libmultipath discovery.c
@ 2011-07-20 21:24 bmarzins
0 siblings, 0 replies; 9+ messages in thread
From: bmarzins @ 2011-07-20 21:24 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: multipath-tools
Branch: RHEL5_FC6
Changes by: bmarzins@sourceware.org 2011-07-20 21:24:52
Modified files:
libmultipath : discovery.c
Log message:
Fix for BZ# 703501. Change to cciss sysfs handling. Not applicable upstream
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/discovery.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.32.2.20&r2=1.32.2.21
--- multipath-tools/libmultipath/discovery.c 2011/04/05 18:41:45 1.32.2.20
+++ multipath-tools/libmultipath/discovery.c 2011/07/20 21:24:52 1.32.2.21
@@ -817,8 +817,7 @@
return 1;
}
- if(safe_sprintf(dev_path, "%s/device/cciss%u/c%ud%u", curpath->dev,
- controller, controller, lun)) {
+ if(safe_sprintf(dev_path, "%s/device", curpath->dev)) {
condlog(0, "dev_path too small");
return 1;
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* multipath-tools/libmultipath discovery.c
@ 2011-03-07 15:45 bmarzins
0 siblings, 0 replies; 9+ messages in thread
From: bmarzins @ 2011-03-07 15:45 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: multipath-tools
Branch: RHEL5_FC6
Changes by: bmarzins@sourceware.org 2011-03-07 15:45:15
Modified files:
libmultipath : discovery.c
Log message:
Increase the length of time we will wait for a file to be created. No applicable
upstream.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/discovery.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.32.2.18&r2=1.32.2.19
--- multipath-tools/libmultipath/discovery.c 2011/02/18 18:27:00 1.32.2.18
+++ multipath-tools/libmultipath/discovery.c 2011/03/07 15:45:15 1.32.2.19
@@ -181,7 +181,7 @@
* not multipath(8), ran by udev
*/
#if DAEMON
-#define WAIT_MAX_SECONDS 60
+#define WAIT_MAX_SECONDS 90
#define WAIT_LOOP_PER_SECOND 5
static int
^ permalink raw reply [flat|nested] 9+ messages in thread
* multipath-tools/libmultipath discovery.c
@ 2010-05-25 23:23 bmarzins
0 siblings, 0 replies; 9+ messages in thread
From: bmarzins @ 2010-05-25 23:23 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: multipath-tools
Branch: RHEL4_FC5
Changes by: bmarzins@sourceware.org 2010-05-25 23:23:07
Modified files:
libmultipath : discovery.c
Log message:
Fix for bz #512065
If you can't get /sys/class/fc_transport/target%i:%i:%i/node_name, try
/sys/class/fc_transport/target%i:%i:%i/node_name.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/discovery.c.diff?cvsroot=dm&only_with_tag=RHEL4_FC5&r1=1.28.2.7&r2=1.28.2.8
--- multipath-tools/libmultipath/discovery.c 2008/04/14 17:59:54 1.28.2.7
+++ multipath-tools/libmultipath/discovery.c 2010/05/25 23:23:07 1.28.2.8
@@ -553,6 +553,21 @@
if (0 <= readattr(attr_path, attr_buff) && strlen(attr_buff) > 0)
strncpy(curpath->tgt_node_name, attr_buff,
strlen(attr_buff) - 1);
+ else {
+ if(safe_sprintf(attr_path,
+ "%s/class/iscsi_transport/target%i:%i:%i/target_name",
+ sysfs_path,
+ curpath->sg_id.host_no,
+ curpath->sg_id.channel,
+ curpath->sg_id.scsi_id)) {
+ condlog(0, "attr_path too small");
+ return 1;
+ }
+ if (0 <= readattr(attr_path, attr_buff) &&
+ strlen(attr_buff) > 0)
+ strncpy(curpath->tgt_node_name, attr_buff,
+ strlen(attr_buff) - 1);
+ }
condlog(3, "tgt_node_name = %s", curpath->tgt_node_name);
return 0;
^ permalink raw reply [flat|nested] 9+ messages in thread
* multipath-tools/libmultipath discovery.c
@ 2009-11-23 21:08 bmarzins
0 siblings, 0 replies; 9+ messages in thread
From: bmarzins @ 2009-11-23 21:08 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: multipath-tools
Branch: RHEL5_FC6
Changes by: bmarzins@sourceware.org 2009-11-23 21:08:34
Modified files:
libmultipath : discovery.c
Log message:
Fix for 527754. multipathd no longer waits for sysfs to create
/sys/block/<devname>/device/state
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/discovery.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.32.2.8&r2=1.32.2.9
--- multipath-tools/libmultipath/discovery.c 2009/06/08 21:38:02 1.32.2.8
+++ multipath-tools/libmultipath/discovery.c 2009/11/23 21:08:34 1.32.2.9
@@ -197,7 +197,7 @@
}
#endif
-#define declare_sysfs_get_str(fname, fmt) \
+#define declare_sysfs_get_str(fname, fmt, dowait) \
extern int \
sysfs_get_##fname (char * sysfs_path, char * dev, char * buff, int len) \
{ \
@@ -207,7 +207,7 @@
if (safe_sprintf(attr_path, fmt, sysfs_path, dev)) \
return 1; \
\
- if (wait_for_file(attr_path)) \
+ if (dowait && wait_for_file(attr_path)) \
return 1; \
\
if (!(attr = sysfs_open_attribute(attr_path))) \
@@ -228,14 +228,14 @@
return 1; \
}
-declare_sysfs_get_str(devtype, "%s/block/%s/device/devtype");
-declare_sysfs_get_str(cutype, "%s/block/%s/device/cutype");
-declare_sysfs_get_str(vendor, "%s/block/%s/device/vendor");
-declare_sysfs_get_str(model, "%s/block/%s/device/model");
-declare_sysfs_get_str(rev, "%s/block/%s/device/rev");
-declare_sysfs_get_str(dev, "%s/block/%s/dev");
-declare_sysfs_get_str(bustype, "%s/block/%s/device/bus");
-declare_sysfs_get_str(state, "%s/block/%s/device/state");
+declare_sysfs_get_str(devtype, "%s/block/%s/device/devtype", 1);
+declare_sysfs_get_str(cutype, "%s/block/%s/device/cutype", 1);
+declare_sysfs_get_str(vendor, "%s/block/%s/device/vendor", 1);
+declare_sysfs_get_str(model, "%s/block/%s/device/model", 1);
+declare_sysfs_get_str(rev, "%s/block/%s/device/rev", 1);
+declare_sysfs_get_str(dev, "%s/block/%s/dev", 1);
+declare_sysfs_get_str(bustype, "%s/block/%s/device/bus", 1);
+declare_sysfs_get_str(state, "%s/block/%s/device/state", 0);
int
sysfs_get_size (char * sysfs_path, char * dev, unsigned long long * size)
^ permalink raw reply [flat|nested] 9+ messages in thread
* multipath-tools/libmultipath discovery.c
@ 2008-04-14 17:59 bmarzins
0 siblings, 0 replies; 9+ messages in thread
From: bmarzins @ 2008-04-14 17:59 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: multipath-tools
Branch: RHEL4_FC5
Changes by: bmarzins@sourceware.org 2008-04-14 17:59:55
Modified files:
libmultipath : discovery.c
Log message:
Move the fd close call to fix a regression caused by the max_fd work.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/discovery.c.diff?cvsroot=dm&only_with_tag=RHEL4_FC5&r1=1.28.2.6&r2=1.28.2.7
--- multipath-tools/libmultipath/discovery.c 2008/03/05 20:53:14 1.28.2.6
+++ multipath-tools/libmultipath/discovery.c 2008/04/14 17:59:54 1.28.2.7
@@ -737,10 +737,6 @@
condlog(3, "serial = %s", pp->serial);
}
-#ifndef DAEMON
- close(pp->fd);
- pp->fd = -1;
-#endif
return 0;
}
@@ -827,6 +823,10 @@
else if (strlen(pp->wwid))
condlog(3, "uid = %s (cache)", pp->wwid);
+#ifndef DAEMON
+ close(pp->fd);
+ pp->fd = -1;
+#endif
return 0;
out:
^ permalink raw reply [flat|nested] 9+ messages in thread
* multipath-tools/libmultipath discovery.c
@ 2008-03-05 20:53 bmarzins
0 siblings, 0 replies; 9+ messages in thread
From: bmarzins @ 2008-03-05 20:53 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: multipath-tools
Branch: RHEL4_FC5
Changes by: bmarzins@sourceware.org 2008-03-05 20:53:16
Modified files:
libmultipath : discovery.c
Log message:
multipath wasn't waiting for the devices to get initialized. This was causing
it to fail during boot.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/discovery.c.diff?cvsroot=dm&only_with_tag=RHEL4_FC5&r1=1.28.2.5&r2=1.28.2.6
--- multipath-tools/libmultipath/discovery.c 2008/01/25 22:30:00 1.28.2.5
+++ multipath-tools/libmultipath/discovery.c 2008/03/05 20:53:14 1.28.2.6
@@ -170,11 +170,6 @@
return r;
}
-/*
- * the daemon can race udev upon path add,
- * not multipath(8), ran by udev
- */
-#if DAEMON
#define WAIT_MAX_SECONDS 5
#define WAIT_LOOP_PER_SECOND 5
@@ -197,13 +192,6 @@
}
return 1;
}
-#else
-static int
-wait_for_file (char * filename)
-{
- return 0;
-}
-#endif
#define declare_sysfs_get_str(fname, fmt) \
extern int \
^ permalink raw reply [flat|nested] 9+ messages in thread
* multipath-tools/libmultipath discovery.c
@ 2006-10-06 18:35 bmarzins
0 siblings, 0 replies; 9+ messages in thread
From: bmarzins @ 2006-10-06 18:35 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: multipath-tools
Changes by: bmarzins@sourceware.org 2006-10-06 18:35:13
Modified files:
libmultipath : discovery.c
Log message:
fixing bz #207726, if sysfs_get_rev fails, don't completely abort all path
checks.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/discovery.c.diff?cvsroot=dm&r1=1.30&r2=1.31
--- multipath-tools/libmultipath/discovery.c 2006/07/12 19:42:43 1.30
+++ multipath-tools/libmultipath/discovery.c 2006/10/06 18:35:13 1.31
@@ -470,7 +470,7 @@
if (sysfs_get_rev(sysfs_path, pp->dev,
pp->rev, SCSI_REV_SIZE))
- return 1;
+ pp->rev[0] = '\0';;
condlog(3, "%s: rev = %s", pp->dev, pp->rev);
^ permalink raw reply [flat|nested] 9+ messages in thread
* multipath-tools/libmultipath discovery.c
@ 2006-10-06 18:09 bmarzins
0 siblings, 0 replies; 9+ messages in thread
From: bmarzins @ 2006-10-06 18:09 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: multipath-tools
Branch: RHEL4_FC5
Changes by: bmarzins@sourceware.org 2006-10-06 18:09:15
Modified files:
libmultipath : discovery.c
Log message:
Comitted patch for 207726
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/discovery.c.diff?cvsroot=dm&only_with_tag=RHEL4_FC5&r1=1.28.2.2&r2=1.28.2.3
--- multipath-tools/libmultipath/discovery.c 2006/09/19 21:06:40 1.28.2.2
+++ multipath-tools/libmultipath/discovery.c 2006/10/06 18:09:14 1.28.2.3
@@ -480,7 +480,7 @@
if (sysfs_get_rev(sysfs_path, curpath->dev,
curpath->rev, SCSI_REV_SIZE))
- return 1;
+ curpath->rev[0] = '\0';
condlog(3, "rev = %s", curpath->rev);
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-07-20 21:24 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-11 23:05 multipath-tools/libmultipath discovery.c bmarzins
-- strict thread matches above, loose matches on Subject: below --
2011-07-20 21:24 bmarzins
2011-03-07 15:45 bmarzins
2010-05-25 23:23 bmarzins
2009-11-23 21:08 bmarzins
2008-04-14 17:59 bmarzins
2008-03-05 20:53 bmarzins
2006-10-06 18:35 bmarzins
2006-10-06 18:09 bmarzins
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.