Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-12616 obclass: fix MDS start/stop race
[fs/lustre-release.git]
/
lustre
/
utils
/
libmount_utils_zfs.c
diff --git
a/lustre/utils/libmount_utils_zfs.c
b/lustre/utils/libmount_utils_zfs.c
index
ebbee5c
..
770a053
100644
(file)
--- a/
lustre/utils/libmount_utils_zfs.c
+++ b/
lustre/utils/libmount_utils_zfs.c
@@
-31,8
+31,7
@@
#include <stdio.h>
#include <string.h>
#include <libzfs.h>
#include <stdio.h>
#include <string.h>
#include <libzfs.h>
-
-#define HOSTID_PATH "/etc/hostid"
+#include <sys/systeminfo.h>
/* Persistent mount data is stored in these user attributes */
#define LDD_PREFIX "lustre:"
/* Persistent mount data is stored in these user attributes */
#define LDD_PREFIX "lustre:"
@@
-273,7
+272,7
@@
static int zfs_check_hostid(struct mkfs_opts *mop)
if (hostid != 0)
return 0;
if (hostid != 0)
return 0;
- f = fopen(HOSTID_PATH, "r");
+ f = fopen(H
W_H
OSTID_PATH, "r");
if (f == NULL)
goto out;
if (f == NULL)
goto out;
@@
-281,7
+280,7
@@
static int zfs_check_hostid(struct mkfs_opts *mop)
fclose(f);
if (rc != 1) {
fclose(f);
if (rc != 1) {
- fprintf(stderr, "Failed to read "HOSTID_PATH": %d\n",
+ fprintf(stderr, "Failed to read "H
W_H
OSTID_PATH": %d\n",
rc);
hostid = 0;
}
rc);
hostid = 0;
}