Whamcloud - gitweb
LU-2976 tools: ZFS upstream sonames are versioned
authorAlexey Shvetsov <alexxy@gentoo.org>
Sat, 16 Mar 2013 18:24:57 +0000 (22:24 +0400)
committerOleg Drokin <oleg.drokin@intel.com>
Tue, 23 Apr 2013 05:57:14 +0000 (01:57 -0400)
Current zfsonlinux upstream has versioned zfs libs sonames, while in
lustre/utils/mount_utils_zfs.c are set unversioned

Versions are
libzfs.so -> libzfs.so.1
libnvpair.so -> libnvpair.so.1

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
Change-Id: I871613081c117731b5ec89fc2d79349df0668f94
Reviewed-on: http://review.whamcloud.com/5742
Tested-by: Hudson
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
lustre/utils/mount_utils_zfs.c

index 5edc8e1..b337c77 100644 (file)
@@ -692,11 +692,11 @@ int zfs_init(void)
         * spamming ldiskfs users. An error message will still be printed if
         * someone tries to do some real work involving a ZFS backend */
 
-       handle_libzfs = dlopen("libzfs.so", RTLD_LAZY);
+       handle_libzfs = dlopen("libzfs.so.1", RTLD_LAZY);
        if (handle_libzfs == NULL)
                return EINVAL;
 
-       handle_nvpair = dlopen("libnvpair.so", RTLD_LAZY);
+       handle_nvpair = dlopen("libnvpair.so.1", RTLD_LAZY);
        if (handle_nvpair == NULL) {
                ret = EINVAL;
                goto out;