land b_colibri_devel on HEAD:

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

diff --git a/lustre/include/lustre_cfg.h b/lustre/include/lustre_cfg.h
index 89c5447..5432519 100644 (file)
--- a/lustre/include/lustre_cfg.h
+++ b/lustre/include/lustre_cfg.h
@@ -58,7 +58,7 @@ enum lcfg_command_type {
         LCFG_LOV_ADD_INA    = 0x00ce013,
         LCFG_ADD_MDC        = 0x00cf014,
         LCFG_DEL_MDC        = 0x00cf015,
-        LCFG_SEC_FLAVOR     = 0x00ce016,
+        LCFG_SPTLRPC_CONF   = 0x00cf016,
 };
 
 struct lustre_cfg_bufs {
@@ -256,9 +256,8 @@ 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 <lustre/lustre_user.h>
+
 #define INVALID_UID     (-1)
 
 #endif // _LUSTRE_CFG_H