X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_cfg.h;h=f3d60a6541300771ec1748632f6a1cab0a398957;hb=655d5e708e01a77368459a1dd9c34fab5b6838b1;hp=13fa4e573e47e4104eae5265612042d75912168a;hpb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_cfg.h b/lustre/include/lustre_cfg.h index 13fa4e5..f3d60a6 100644 --- a/lustre/include/lustre_cfg.h +++ b/lustre/include/lustre_cfg.h @@ -1,28 +1,47 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2001 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #ifndef _LUSTRE_CFG_H #define _LUSTRE_CFG_H +/** \defgroup cfg cfg + * + * @{ + */ + /* * 1cf6 * lcfG @@ -31,56 +50,66 @@ #define LUSTRE_CFG_MAX_BUFCOUNT 8 #define LCFG_HDR_SIZE(count) \ - size_round(offsetof (struct lustre_cfg, lcfg_buflens[(count)])) + cfs_size_round(offsetof (struct lustre_cfg, lcfg_buflens[(count)])) -/* If not LCFG_REQUIRED, we can ignore this cmd and go on. */ +/** If the LCFG_REQUIRED bit is set in a configuration command, + * then the client is required to understand this parameter + * in order to mount the filesystem. If it does not understand + * a REQUIRED command the client mount will fail. */ #define LCFG_REQUIRED 0x0001000 enum lcfg_command_type { - LCFG_ATTACH = 0x00cf001, - LCFG_DETACH = 0x00cf002, - LCFG_SETUP = 0x00cf003, - LCFG_CLEANUP = 0x00cf004, - LCFG_ADD_UUID = 0x00cf005, - LCFG_DEL_UUID = 0x00cf006, - LCFG_MOUNTOPT = 0x00cf007, - LCFG_DEL_MOUNTOPT = 0x00cf008, - LCFG_SET_TIMEOUT = 0x00cf009, - LCFG_SET_UPCALL = 0x00cf00a, - LCFG_ADD_CONN = 0x00cf00b, - LCFG_DEL_CONN = 0x00cf00c, - LCFG_LOV_ADD_OBD = 0x00cf00d, - LCFG_LOV_DEL_OBD = 0x00cf00e, - LCFG_PARAM = 0x00cf00f, - LCFG_MARKER = 0x00cf010, - LCFG_LOG_START = 0x00ce011, - LCFG_LOG_END = 0x00ce012, - LCFG_LOV_ADD_INA = 0x00ce013, - LCFG_ADD_MDC = 0x00cf014, - LCFG_DEL_MDC = 0x00cf015, - LCFG_SEC_FLAVOR = 0x00ce016, + LCFG_ATTACH = 0x00cf001, /**< create a new obd instance */ + LCFG_DETACH = 0x00cf002, /**< destroy obd instance */ + LCFG_SETUP = 0x00cf003, /**< call type-specific setup */ + LCFG_CLEANUP = 0x00cf004, /**< call type-specific cleanup */ + LCFG_ADD_UUID = 0x00cf005, /**< add a nid to a niduuid */ + LCFG_DEL_UUID = 0x00cf006, /**< remove a nid from a niduuid */ + LCFG_MOUNTOPT = 0x00cf007, /**< create a profile (mdc, osc) */ + LCFG_DEL_MOUNTOPT = 0x00cf008, /**< destroy a profile */ + LCFG_SET_TIMEOUT = 0x00cf009, /**< set obd_timeout */ + LCFG_SET_UPCALL = 0x00cf00a, /**< deprecated */ + LCFG_ADD_CONN = 0x00cf00b, /**< add a failover niduuid to an obd */ + LCFG_DEL_CONN = 0x00cf00c, /**< remove a failover niduuid */ + LCFG_LOV_ADD_OBD = 0x00cf00d, /**< add an osc to a lov */ + LCFG_LOV_DEL_OBD = 0x00cf00e, /**< remove an osc from a lov */ + LCFG_PARAM = 0x00cf00f, /**< set a proc parameter */ + LCFG_MARKER = 0x00cf010, /**< metadata about next cfg rec */ + LCFG_LOG_START = 0x00ce011, /**< mgc only, process a cfg log */ + LCFG_LOG_END = 0x00ce012, /**< stop processing updates */ + LCFG_LOV_ADD_INA = 0x00ce013, /**< like LOV_ADD_OBD, inactive */ + LCFG_ADD_MDC = 0x00cf014, /**< add an mdc to a lmv */ + LCFG_DEL_MDC = 0x00cf015, /**< remove an mdc from a lmv */ + LCFG_SPTLRPC_CONF = 0x00ce016, /**< security */ + LCFG_POOL_NEW = 0x00ce020, /**< create an ost pool name */ + LCFG_POOL_ADD = 0x00ce021, /**< add an ost to a pool */ + LCFG_POOL_REM = 0x00ce022, /**< remove an ost from a pool */ + LCFG_POOL_DEL = 0x00ce023, /**< destroy an ost pool name */ + LCFG_SET_LDLM_TIMEOUT = 0x00ce030, /**< set ldlm_timeout */ }; struct lustre_cfg_bufs { void *lcfg_buf[LUSTRE_CFG_MAX_BUFCOUNT]; - uint32_t lcfg_buflen[LUSTRE_CFG_MAX_BUFCOUNT]; - uint32_t lcfg_bufcount; + __u32 lcfg_buflen[LUSTRE_CFG_MAX_BUFCOUNT]; + __u32 lcfg_bufcount; }; -/* Mountconf transitional hack, should go away after 1.6 */ -#define LCFG_FLG_MOUNTCONF 0x400 - struct lustre_cfg { - uint32_t lcfg_version; - uint32_t lcfg_command; + __u32 lcfg_version; + __u32 lcfg_command; + + __u32 lcfg_num; + __u32 lcfg_flags; + __u64 lcfg_nid; + __u32 lcfg_nal; /* not used any more */ - uint32_t lcfg_num; - uint32_t lcfg_flags; - uint64_t lcfg_nid; - uint32_t lcfg_nal; /* not used any more */ + __u32 lcfg_bufcount; + __u32 lcfg_buflens[0]; +}; - uint32_t lcfg_bufcount; - uint32_t lcfg_buflens[0]; +enum cfg_record_type { + PORTALS_CFG_TYPE = 1, + LUSTRE_CFG_TYPE = 123, }; #define LUSTRE_CFG_BUFLEN(lcfg, idx) \ @@ -89,9 +118,9 @@ struct lustre_cfg { : (lcfg)->lcfg_buflens[(idx)]) static inline void lustre_cfg_bufs_set(struct lustre_cfg_bufs *bufs, - uint32_t index, + __u32 index, void *buf, - uint32_t buflen) + __u32 buflen) { if (index >= LUSTRE_CFG_MAX_BUFCOUNT) return; @@ -106,7 +135,7 @@ static inline void lustre_cfg_bufs_set(struct lustre_cfg_bufs *bufs, } static inline void lustre_cfg_bufs_set_string(struct lustre_cfg_bufs *bufs, - uint32_t index, + __u32 index, char *str) { lustre_cfg_bufs_set(bufs, index, str, str ? strlen(str) + 1 : 0); @@ -133,7 +162,7 @@ static inline void *lustre_cfg_buf(struct lustre_cfg *lcfg, int index) offset = LCFG_HDR_SIZE(lcfg->lcfg_bufcount); for (i = 0; i < index; i++) - offset += size_round(lcfg->lcfg_buflens[i]); + offset += cfs_size_round(lcfg->lcfg_buflens[i]); return (char *)lcfg + offset; } @@ -164,7 +193,7 @@ static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, int index) */ if (s[lcfg->lcfg_buflens[index] - 1] != '\0') { int last = min((int)lcfg->lcfg_buflens[index], - size_round(lcfg->lcfg_buflens[index]) - 1); + cfs_size_round(lcfg->lcfg_buflens[index]) - 1); char lost = s[last]; s[last] = '\0'; if (lost != '\0') { @@ -175,7 +204,7 @@ static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, int index) return s; } -static inline int lustre_cfg_len(uint32_t bufcount, uint32_t *buflens) +static inline int lustre_cfg_len(__u32 bufcount, __u32 *buflens) { int i; int len; @@ -183,9 +212,9 @@ static inline int lustre_cfg_len(uint32_t bufcount, uint32_t *buflens) len = LCFG_HDR_SIZE(bufcount); for (i = 0; i < bufcount; i++) - len += size_round(buflens[i]); + len += cfs_size_round(buflens[i]); - RETURN(size_round(len)); + RETURN(cfs_size_round(len)); } @@ -203,7 +232,7 @@ static inline struct lustre_cfg *lustre_cfg_new(int cmd, OBD_ALLOC(lcfg, lustre_cfg_len(bufs->lcfg_bufcount, bufs->lcfg_buflen)); if (!lcfg) - RETURN(lcfg); + RETURN(ERR_PTR(-ENOMEM)); lcfg->lcfg_version = LUSTRE_CFG_VERSION; lcfg->lcfg_command = cmd; @@ -256,9 +285,10 @@ static inline int lustre_cfg_sanity_check(void *buf, int len) RETURN(0); } -/* default value for nllu/nllg for llite */ -#define NOBODY_UID 99 -#define NOBODY_GID 99 +#include + #define INVALID_UID (-1) +/** @} cfg */ + #endif // _LUSTRE_CFG_H