X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_cfg.h;h=0685df558ba4b3bd120b2cd6b2e792f059acbd46;hb=72057a3af19ee02d9a686bd7e7d074917e381310;hp=1aebf8bae031e37d2fc849e2e170a22978b3ef97;hpb=ae295503f53e867e11dc51b217f336e8b20d119f;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_cfg.h b/lustre/include/lustre_cfg.h index 1aebf8b..0685df5 100644 --- a/lustre/include/lustre_cfg.h +++ b/lustre/include/lustre_cfg.h @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2013, Intel Corporation. + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -37,6 +33,16 @@ #ifndef _LUSTRE_CFG_H #define _LUSTRE_CFG_H +#include +#include + +#ifdef __KERNEL__ +# include +#else /* !__KERNEL__ */ +# include +# include +#endif /* __KERNEL__ */ + /** \defgroup cfg cfg * * @{ @@ -105,6 +111,10 @@ enum lcfg_command_type { LCFG_NODEMAP_SQUASH_GID = 0x00ce052, /**< default map gid */ 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 */ + LCFG_NODEMAP_SET_FILESET = 0x00ce057, /**< set fileset */ + LCFG_NODEMAP_DENY_UNKNOWN = 0x00ce058, /**< deny squashed nodemap users */ }; struct lustre_cfg_bufs { @@ -167,13 +177,12 @@ static inline void lustre_cfg_bufs_reset(struct lustre_cfg_bufs *bufs, char *nam 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) @@ -188,7 +197,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) { - 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]; @@ -196,7 +205,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; @@ -212,9 +221,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') { - 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", @@ -224,10 +238,10 @@ static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, int index) 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); @@ -237,47 +251,50 @@ static inline int lustre_cfg_len(__u32 bufcount, __u32 *buflens) 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 + 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, - 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) { - 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, int len) +static inline int lustre_cfg_sanity_check(void *buf, size_t len) { struct lustre_cfg *lcfg = (struct lustre_cfg *)buf; ENTRY; @@ -305,12 +322,6 @@ static inline int lustre_cfg_sanity_check(void *buf, int len) RETURN(0); } -#include - -#ifndef INVALID_UID -#define INVALID_UID (-1) -#endif - /** @} cfg */ -#endif // _LUSTRE_CFG_H +#endif /* _LUSTRE_CFG_H */