Hello community, here is the log from the commit of package iprutils for openSUSE:Factory checked in at 2014-05-10 08:32:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iprutils (Old) and /work/SRC/openSUSE:Factory/.iprutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iprutils" Changes: -------- --- /work/SRC/openSUSE:Factory/iprutils/iprutils.changes 2014-04-14 06:42:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iprutils.new/iprutils.changes 2014-05-10 08:32:47.000000000 +0200 @@ -1,0 +2,9 @@ +Tue May 6 10:01:45 UTC 2014 - [email protected] + +- fix generation of ipr dump file (BNC#876235) +- fix for GTO dual configuration in query-path-status (BNC#876236) + +- added patches: + * iprutils.generate_ipr_dump_file.patch + * iprutils.redundant_paths_in_GTO.patch +------------------------------------------------------------------- New: ---- iprutils.generate_ipr_dump_file.patch iprutils.redundant_paths_in_GTO.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iprutils.spec ++++++ --- /var/tmp/diff_new_pack.Vb038R/_old 2014-05-10 08:32:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Vb038R/_new 2014-05-10 08:32:48.000000000 +0200 @@ -30,6 +30,8 @@ Patch1: iprutils.install-man.patch Patch2: iprutils.runlevel.patch Patch4: iprutils-close.diff +Patch5: iprutils.redundant_paths_in_GTO.patch +Patch6: iprutils.generate_ipr_dump_file.patch Source1: iprdump.service Source2: iprinit.service Source3: iprupdate.service @@ -52,6 +54,8 @@ %patch1 -p1 %patch2 -p1 %patch4 -p1 +%patch5 -p2 +%patch6 -p2 %build make %{?_smp_mflags} CFLAGS="%{optflags} -I/usr/include/ncurses \$(IPR_DEFINES)" CC="gcc" ++++++ iprutils.generate_ipr_dump_file.patch ++++++ --- iprutils/iprdump.c | 7 ++++++- iprutils/iprlib.c | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) Index: b/iprutils/iprdump.c =================================================================== --- a/iprutils/iprdump.c 2014-05-02 17:58:23.447765969 -0500 +++ b/iprutils/iprdump.c 2014-05-02 17:59:07.888676030 -0500 @@ -98,8 +98,13 @@ static void disable_dump(struct ipr_ioa static int read_dump(struct ipr_ioa *ioa) { int count = 0; + char path[PATH_MAX]; + FILE *file; + + sprintf(path, "/sys/class/scsi_host/%s/%s", ioa->host_name, "dump"); + file = fopen(path, "r"); + count = fread(&dump, 1 , sizeof(dump), file); - count = ipr_read_host_attr(ioa, "dump", &dump, sizeof(dump)); return (count < 0) ? 0: count; } Index: b/iprutils/iprlib.c =================================================================== --- a/iprutils/iprlib.c 2014-05-02 17:57:56.477764788 -0500 +++ b/iprutils/iprlib.c 2014-05-02 17:59:07.888676030 -0500 @@ -2184,7 +2184,7 @@ void ipr_reset_adapter(struct ipr_ioa *i * @value_len: length of value string * * Returns: - * 0 if success / non-zero on failure + * >= 0 if success / < 0 on failure **/ int ipr_read_host_attr(struct ipr_ioa *ioa, char *name, void *value, size_t value_len) @@ -2198,7 +2198,7 @@ int ipr_read_host_attr(struct ipr_ioa *i ioa_dbg(ioa, "Failed to read %s attribute. %m\n", name); return -EIO; } - return 0; + return len; } /** @@ -2209,7 +2209,7 @@ int ipr_read_host_attr(struct ipr_ioa *i * @value_len: length of value string * * Returns: - * 0 if success / non-zero on failure + * >= 0 if success / < 0 on failure **/ int ipr_write_host_attr(struct ipr_ioa *ioa, char *name, void *value, size_t value_len) @@ -2223,7 +2223,7 @@ int ipr_write_host_attr(struct ipr_ioa * ioa_dbg(ioa, "Failed to write %s attribute. %m\n", name); return -EIO; } - return 0; + return len; } /** ++++++ iprutils.redundant_paths_in_GTO.patch ++++++ --- iprutils/iprlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: b/iprutils/iprlib.c =================================================================== --- a/iprutils/iprlib.c 2014-05-02 17:17:03.000000000 -0500 +++ b/iprutils/iprlib.c 2014-05-02 17:55:01.097764747 -0500 @@ -4090,7 +4090,7 @@ int ipr_query_res_redundancy_info(struct int fd, rc; if (scsi_dev_data) - res_handle = scsi_dev_data->handle; + res_handle = ntohl(scsi_dev_data->handle); else if (ipr_is_af_dasd_device(dev)) { dev_record = dev->dev_rcd; if (dev_record->no_cfgte_dev) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
