Accepting request 220505 from home:goldwynr:branches:network:ha-clustering:Factory

Use complete filename for libcmap for dlopen()

OBS-URL: https://build.opensuse.org/request/show/220505
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=76
This commit is contained in:
Goldwyn Rodrigues 2014-01-31 16:57:09 +00:00 committed by Git OBS Bridge
parent 77f75ace9a
commit 00d7c91453

View File

@ -1,8 +1,9 @@
From 1110d13d756406a6188299bf68db4743cf7c41a3 Mon Sep 17 00:00:00 2001 From 6423caf73ef9d0f22acf294e100523bc2af3acc9 Mon Sep 17 00:00:00 2001
From: Goldwyn Rodrigues <rgoldwyn@suse.com> From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Date: Sat, 21 Dec 2013 18:41:04 -0600 Date: Sat, 21 Dec 2013 18:41:04 -0600
Subject: [PATCH] Use cmap for getting cluster name Subject: [PATCH] Use cmap for getting cluster name
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
--- ---
debugfs.ocfs2/Makefile | 2 +- debugfs.ocfs2/Makefile | 2 +-
libo2cb/o2cb_abi.c | 79 +++++++++++++++++++++++++++----------------------- libo2cb/o2cb_abi.c | 79 +++++++++++++++++++++++++++-----------------------
@ -24,7 +25,7 @@ index ca4c9a4..30dfa5f 100644
MANS = debugfs.ocfs2.8 MANS = debugfs.ocfs2.8
diff --git a/libo2cb/o2cb_abi.c b/libo2cb/o2cb_abi.c diff --git a/libo2cb/o2cb_abi.c b/libo2cb/o2cb_abi.c
index ae03595..40f8176 100644 index ae03595..6c3ad73 100644
--- a/libo2cb/o2cb_abi.c --- a/libo2cb/o2cb_abi.c
+++ b/libo2cb/o2cb_abi.c +++ b/libo2cb/o2cb_abi.c
@@ -35,6 +35,8 @@ @@ -35,6 +35,8 @@
@ -69,7 +70,7 @@ index ae03595..40f8176 100644
- break; - break;
- } - }
+ +
+ lib_handle = dlopen("libcmap.so", RTLD_NOW | RTLD_LOCAL); + lib_handle = dlopen("libcmap.so.4", RTLD_NOW | RTLD_LOCAL);
+ if (!lib_handle) + if (!lib_handle)
+ return ret; + return ret;
+ +