b=15253 add conf_param -d to remove permanent settings

[fs/lustre-release.git] / lustre / include / lustre_cfg.h

diff --git a/lustre/include/lustre_cfg.h b/lustre/include/lustre_cfg.h
index c51c0d3..f1b103a 100644 (file)
--- a/lustre/include/lustre_cfg.h
+++ b/lustre/include/lustre_cfg.h
@@ -37,6 +37,11 @@
 #ifndef _LUSTRE_CFG_H
 #define _LUSTRE_CFG_H
 
+/** \defgroup cfg cfg
+ *
+ * @{
+ */
+
 /*
  * 1cf6
  * lcfG
@@ -45,9 +50,12 @@
 #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 {
@@ -77,6 +85,7 @@ enum lcfg_command_type {
         LCFG_POOL_ADD           = 0x00ce021,
         LCFG_POOL_REM           = 0x00ce022,
         LCFG_POOL_DEL           = 0x00ce023,
+        LCFG_SET_LDLM_TIMEOUT   = 0x00ce030,
 };
 
 struct lustre_cfg_bufs {
@@ -85,9 +94,6 @@ struct lustre_cfg_bufs {
         __u32    lcfg_bufcount;
 };
 
-/* Mountconf transitional hack, should go away after 1.6 */
-#define LCFG_FLG_MOUNTCONF 0x400
-
 struct lustre_cfg {
         __u32 lcfg_version;
         __u32 lcfg_command;
@@ -156,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;
 }
 
@@ -187,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') {
@@ -206,9 +212,9 @@ static inline int lustre_cfg_len(__u32 bufcount, __u32 *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));
 }
 
 
@@ -283,4 +289,6 @@ static inline int lustre_cfg_sanity_check(void *buf, int len)
 
 #define INVALID_UID     (-1)
 
+/** @} cfg */
+
 #endif // _LUSTRE_CFG_H