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-8551 test: Use mds1 rather than mds to operate on MDT0000
[fs/lustre-release.git]
/
lustre
/
utils
/
libiam.c
diff --git
a/lustre/utils/libiam.c
b/lustre/utils/libiam.c
index
9b64c61
..
1b12696
100644
(file)
--- a/
lustre/utils/libiam.c
+++ b/
lustre/utils/libiam.c
@@
-26,6
+26,8
@@
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2014, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-47,14
+49,11
@@
#include <string.h>
#include <errno.h>
#include <assert.h>
#include <string.h>
#include <errno.h>
#include <assert.h>
-
+#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/types.h>
-#ifdef HAVE_ENDIAN_H
-#include <endian.h>
-#endif
-
-#include <libcfs/libcfs.h>
+#include <libcfs/byteorder.h>
+#include <libcfs/util/string.h>
#include <lustre/libiam.h>
typedef __u32 lvar_hash_t;
#include <lustre/libiam.h>
typedef __u32 lvar_hash_t;
@@
-348,7
+347,7
@@
static char *iam_convert(int size, int need_convert, char *source)
free(opt);
}
} else {
free(opt);
}
} else {
-
strn
cpy(ptr, source, size + 1);
+
strl
cpy(ptr, source, size + 1);
}
return ptr;
}
return ptr;