LU-4278 libcfs: remove LWT

[fs/lustre-release.git] / lustre / utils / mount_utils_zfs.c

diff --git a/lustre/utils/mount_utils_zfs.c b/lustre/utils/mount_utils_zfs.c
index 79c4e94..66ee68d 100644 (file)
--- a/lustre/utils/mount_utils_zfs.c
+++ b/lustre/utils/mount_utils_zfs.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  * Use is subject to license terms.
  *
  */
@@ -34,15 +34,15 @@
 #include <dlfcn.h>
 
 /* Persistent mount data is stored in these user attributes */
-#define LDD_PREFIX                     "lustre:"
-#define LDD_VERSION_PROP               "lustre:version"
-#define LDD_FLAGS_PROP                 "lustre:flags"
-#define LDD_INDEX_PROP                 "lustre:index"
-#define LDD_FSNAME_PROP                        "lustre:fsname"
-#define LDD_SVNAME_PROP                        "lustre:svname"
-#define LDD_UUID_PROP                  "lustre:uuid"
-#define LDD_USERDATA_PROP              "lustre:userdata"
-#define LDD_MOUNTOPTS_PROP             "lustre:mountopts"
+#define LDD_PREFIX             "lustre:"
+#define LDD_VERSION_PROP       LDD_PREFIX "version"
+#define LDD_FLAGS_PROP         LDD_PREFIX "flags"
+#define LDD_INDEX_PROP         LDD_PREFIX "index"
+#define LDD_FSNAME_PROP                LDD_PREFIX "fsname"
+#define LDD_SVNAME_PROP                LDD_PREFIX "svname"
+#define LDD_UUID_PROP          LDD_PREFIX "uuid"
+#define LDD_USERDATA_PROP      LDD_PREFIX "userdata"
+#define LDD_MOUNTOPTS_PROP     LDD_PREFIX "mountopts"
 
 /* This structure is used to help bridge the gap between the ZFS
  * properties Lustre uses and their corresponding internal LDD fields.
@@ -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;