X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_cfg.h;h=e1a03e7974b30f03e00da851f81892b452acca92;hb=510b04494f3271675da53048f5987867e507f083;hp=266d6f5ec43c74e7a46b217fae3f392c6298d871;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_cfg.h b/lustre/include/lustre_cfg.h
index 266d6f5..e1a03e7 100644
--- a/lustre/include/lustre_cfg.h
+++ b/lustre/include/lustre_cfg.h
@@ -47,32 +47,40 @@
 #define LCFG_HDR_SIZE(count) \
     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_SPTLRPC_CONF   = 0x00ce016,
+        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_SPTLRPC_CONF       = 0x00ce016,
+        LCFG_POOL_NEW           = 0x00ce020,
+        LCFG_POOL_ADD           = 0x00ce021,
+        LCFG_POOL_REM           = 0x00ce022,
+        LCFG_POOL_DEL           = 0x00ce023,
+        LCFG_SET_LDLM_TIMEOUT   = 0x00ce030,
 };
 
 struct lustre_cfg_bufs {
@@ -222,7 +230,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;