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-7543 obd: reserve connection flag OBD_CONNECT_OBDOPACK
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_cfg.h
diff --git
a/lustre/include/lustre_cfg.h
b/lustre/include/lustre_cfg.h
index
2d8b83e
..
71c65c3
100644
(file)
--- a/
lustre/include/lustre_cfg.h
+++ b/
lustre/include/lustre_cfg.h
@@
-27,7
+27,7
@@
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
3
, Intel Corporation.
+ * Copyright (c) 2012, 201
4
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-37,6
+37,16
@@
#ifndef _LUSTRE_CFG_H
#define _LUSTRE_CFG_H
#ifndef _LUSTRE_CFG_H
#define _LUSTRE_CFG_H
+#include <libcfs/libcfs.h>
+#include <lustre/lustre_user.h>
+
+#ifdef __KERNEL__
+# include <obd_support.h>
+#else /* !__KERNEL__ */
+# include <malloc.h>
+# include <stdlib.h>
+#endif /* __KERNEL__ */
+
/** \defgroup cfg cfg
*
* @{
/** \defgroup cfg cfg
*
* @{
@@
-106,6
+116,7
@@
enum lcfg_command_type {
LCFG_NODEMAP_ADD_SHKEY = 0x00ce053, /**< add shared key to cluster */
LCFG_NODEMAP_DEL_SHKEY = 0x00ce054, /**< delete shared key from cluster */
LCFG_NODEMAP_TEST_NID = 0x00ce055, /**< test for nodemap membership */
LCFG_NODEMAP_ADD_SHKEY = 0x00ce053, /**< add shared key to cluster */
LCFG_NODEMAP_DEL_SHKEY = 0x00ce054, /**< delete shared key from cluster */
LCFG_NODEMAP_TEST_NID = 0x00ce055, /**< test for nodemap membership */
+ LCFG_NODEMAP_TEST_ID = 0x00ce056, /**< test uid/gid mapping */
};
struct lustre_cfg_bufs {
};
struct lustre_cfg_bufs {
@@
-168,13
+179,12
@@
static inline void lustre_cfg_bufs_reset(struct lustre_cfg_bufs *bufs, char *nam
lustre_cfg_bufs_set_string(bufs, 0, name);
}
lustre_cfg_bufs_set_string(bufs, 0, name);
}
-static inline void *lustre_cfg_buf(struct lustre_cfg *lcfg,
int
index)
+static inline void *lustre_cfg_buf(struct lustre_cfg *lcfg,
__u32
index)
{
{
- int i;
- int offset;
- int bufcount;
- LASSERT (lcfg != NULL);
- LASSERT (index >= 0);
+ __u32 i;
+ size_t offset;
+ __u32 bufcount;
+ LASSERT (lcfg != NULL);
bufcount = lcfg->lcfg_bufcount;
if (index >= bufcount)
bufcount = lcfg->lcfg_bufcount;
if (index >= bufcount)
@@
-189,7
+199,7
@@
static inline void *lustre_cfg_buf(struct lustre_cfg *lcfg, int index)
static inline void lustre_cfg_bufs_init(struct lustre_cfg_bufs *bufs,
struct lustre_cfg *lcfg)
{
static inline void lustre_cfg_bufs_init(struct lustre_cfg_bufs *bufs,
struct lustre_cfg *lcfg)
{
-
int
i;
+
__u32
i;
bufs->lcfg_bufcount = lcfg->lcfg_bufcount;
for (i = 0; i < bufs->lcfg_bufcount; i++) {
bufs->lcfg_buflen[i] = lcfg->lcfg_buflens[i];
bufs->lcfg_bufcount = lcfg->lcfg_bufcount;
for (i = 0; i < bufs->lcfg_bufcount; i++) {
bufs->lcfg_buflen[i] = lcfg->lcfg_buflens[i];
@@
-197,7
+207,7
@@
static inline void lustre_cfg_bufs_init(struct lustre_cfg_bufs *bufs,
}
}
}
}
-static inline char *lustre_cfg_string(struct lustre_cfg *lcfg,
int
index)
+static inline char *lustre_cfg_string(struct lustre_cfg *lcfg,
__u32
index)
{
char *s;
{
char *s;
@@
-213,9
+223,14
@@
static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, int index)
* of data. Try to use the padding first though.
*/
if (s[lcfg->lcfg_buflens[index] - 1] != '\0') {
* of data. Try to use the padding first though.
*/
if (s[lcfg->lcfg_buflens[index] - 1] != '\0') {
- int last = min((int)lcfg->lcfg_buflens[index],
- cfs_size_round(lcfg->lcfg_buflens[index]) - 1);
- char lost = s[last];
+ size_t last = cfs_size_round(lcfg->lcfg_buflens[index]) - 1;
+ char lost;
+
+ /* Use the smaller value */
+ if (last > lcfg->lcfg_buflens[index])
+ last = lcfg->lcfg_buflens[index];
+
+ lost = s[last];
s[last] = '\0';
if (lost != '\0') {
CWARN("Truncated buf %d to '%s' (lost '%c'...)\n",
s[last] = '\0';
if (lost != '\0') {
CWARN("Truncated buf %d to '%s' (lost '%c'...)\n",
@@
-225,10
+240,10
@@
static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, int index)
return s;
}
return s;
}
-static inline
int
lustre_cfg_len(__u32 bufcount, __u32 *buflens)
+static inline
__u32
lustre_cfg_len(__u32 bufcount, __u32 *buflens)
{
{
-
int
i;
-
int
len;
+
__u32
i;
+
__u32
len;
ENTRY;
len = LCFG_HDR_SIZE(bufcount);
ENTRY;
len = LCFG_HDR_SIZE(bufcount);
@@
-238,47
+253,50
@@
static inline int lustre_cfg_len(__u32 bufcount, __u32 *buflens)
RETURN(cfs_size_round(len));
}
RETURN(cfs_size_round(len));
}
+static inline void lustre_cfg_init(struct lustre_cfg *lcfg, int cmd,
+ struct lustre_cfg_bufs *bufs)
+{
+ char *ptr;
+ __u32 i;
+
+ lcfg->lcfg_version = LUSTRE_CFG_VERSION;
+ lcfg->lcfg_command = cmd;
+ lcfg->lcfg_bufcount = bufs->lcfg_bufcount;
-#include <obd_support.h>
+ ptr = (char *)lcfg + LCFG_HDR_SIZE(lcfg->lcfg_bufcount);
+ for (i = 0; i < lcfg->lcfg_bufcount; i++) {
+ lcfg->lcfg_buflens[i] = bufs->lcfg_buflen[i];
+ LOGL((char *)bufs->lcfg_buf[i], bufs->lcfg_buflen[i], ptr);
+ }
+}
static inline struct lustre_cfg *lustre_cfg_new(int cmd,
static inline struct lustre_cfg *lustre_cfg_new(int cmd,
-
struct lustre_cfg_bufs *bufs)
+ struct lustre_cfg_bufs *bufs)
{
{
- struct lustre_cfg *lcfg;
- char *ptr;
- int i;
+ struct lustre_cfg *lcfg;
- ENTRY;
-
- OBD_ALLOC(lcfg, lustre_cfg_len(bufs->lcfg_bufcount,
- bufs->lcfg_buflen));
- if (!lcfg)
- RETURN(ERR_PTR(-ENOMEM));
+#ifdef __KERNEL__
+ OBD_ALLOC(lcfg, lustre_cfg_len(bufs->lcfg_bufcount, bufs->lcfg_buflen));
+#else /* !__KERNEL__ */
+ lcfg = malloc(lustre_cfg_len(bufs->lcfg_bufcount, bufs->lcfg_buflen));
+#endif /* __KERNEL__ */
- lcfg->lcfg_version = LUSTRE_CFG_VERSION;
- lcfg->lcfg_command = cmd;
- lcfg->lcfg_bufcount = bufs->lcfg_bufcount;
+ if (lcfg != NULL)
+ lustre_cfg_init(lcfg, cmd, bufs);
- ptr = (char *)lcfg + LCFG_HDR_SIZE(lcfg->lcfg_bufcount);
- for (i = 0; i < lcfg->lcfg_bufcount; i++) {
- lcfg->lcfg_buflens[i] = bufs->lcfg_buflen[i];
- LOGL((char *)bufs->lcfg_buf[i], bufs->lcfg_buflen[i], ptr);
- }
- RETURN(lcfg);
+ return lcfg;
}
static inline void lustre_cfg_free(struct lustre_cfg *lcfg)
{
}
static inline void lustre_cfg_free(struct lustre_cfg *lcfg)
{
- int len;
-
- len = lustre_cfg_len(lcfg->lcfg_bufcount, lcfg->lcfg_buflens);
-
- OBD_FREE(lcfg, len);
- EXIT;
- return;
+#ifdef __KERNEL__
+ OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount, lcfg->lcfg_buflens));
+#else /* ! __KERNEL__ */
+ free(lcfg);
+#endif /* __KERNEL__ */
}
}
-static inline int lustre_cfg_sanity_check(void *buf,
in
t len)
+static inline int lustre_cfg_sanity_check(void *buf,
size_
t len)
{
struct lustre_cfg *lcfg = (struct lustre_cfg *)buf;
ENTRY;
{
struct lustre_cfg *lcfg = (struct lustre_cfg *)buf;
ENTRY;
@@
-306,12
+324,6
@@
static inline int lustre_cfg_sanity_check(void *buf, int len)
RETURN(0);
}
RETURN(0);
}
-#include <lustre/lustre_user.h>
-
-#ifndef INVALID_UID
-#define INVALID_UID (-1)
-#endif
-
/** @} cfg */
/** @} cfg */
-#endif /
/ _LUSTRE_CFG_H
+#endif /
* _LUSTRE_CFG_H */