X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_cfg.h;h=d86ba777b9f44ab727011dd916dba1f6f86f0a38;hb=b641d44bf4e95b635b031f17392ab4b672ebdb09;hp=ae956bf63b0077b330697a547281c666a2280534;hpb=1a1e988a066cdb4e30599722c7a7f6fdebdb9ccb;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_cfg.h b/lustre/include/lustre_cfg.h
index ae956bf..d86ba77 100644
--- a/lustre/include/lustre_cfg.h
+++ b/lustre/include/lustre_cfg.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -86,6 +86,8 @@ enum lcfg_command_type {
         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 */
+	LCFG_PRE_CLEANUP        = 0x00cf031, /**< call type-specific pre
+					      * cleanup cleanup */
 };
 
 struct lustre_cfg_bufs {
@@ -95,16 +97,16 @@ struct lustre_cfg_bufs {
 };
 
 struct lustre_cfg {
-        __u32 lcfg_version;
-        __u32 lcfg_command;
+	__u32 lcfg_version;
+	__u32 lcfg_command;
 
-        __u32 lcfg_num; 
-        __u32 lcfg_flags;
-        __u64 lcfg_nid;
-        __u32 lcfg_nal;                      /* not used any more */
+	__u32 lcfg_num;
+	__u32 lcfg_flags;
+	__u64 lcfg_nid;
+	__u32 lcfg_nal;		/* not used any more */
 
-        __u32 lcfg_bufcount;
-        __u32 lcfg_buflens[0];
+	__u32 lcfg_bufcount;
+	__u32 lcfg_buflens[0];
 };
 
 enum cfg_record_type {
@@ -179,29 +181,30 @@ static inline void lustre_cfg_bufs_init(struct lustre_cfg_bufs *bufs,
 
 static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, int index)
 {
-        char *s;
-
-        if (!lcfg->lcfg_buflens[index])
-                return NULL;
-
-        s = lustre_cfg_buf(lcfg, index);
-        if (!s)
-                return NULL;
-
-        /* make sure it's NULL terminated, even if this kills a char
-         * 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];
-                s[last] = '\0';
-                if (lost != '\0') {
-                        CWARN("Truncated buf %d to '%s' (lost '%c'...)\n",
-                              index, s, lost);
-                }
-        }
-        return s;
+	char *s;
+
+	if (lcfg->lcfg_buflens[index] == 0)
+		return NULL;
+
+	s = lustre_cfg_buf(lcfg, index);
+	if (s == NULL)
+		return NULL;
+
+	/*
+	 * make sure it's NULL terminated, even if this kills a char
+	 * 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];
+		s[last] = '\0';
+		if (lost != '\0') {
+			CWARN("Truncated buf %d to '%s' (lost '%c'...)\n",
+			      index, s, lost);
+		}
+	}
+	return s;
 }
 
 static inline int lustre_cfg_len(__u32 bufcount, __u32 *buflens)
@@ -270,7 +273,7 @@ static inline int lustre_cfg_sanity_check(void *buf, int len)
 
         if (lcfg->lcfg_version != LUSTRE_CFG_VERSION)
                 RETURN(-EINVAL);
-        
+
         if (lcfg->lcfg_bufcount >= LUSTRE_CFG_MAX_BUFCOUNT)
                 RETURN(-EINVAL);
 
@@ -287,7 +290,9 @@ static inline int lustre_cfg_sanity_check(void *buf, int len)
 
 #include <lustre/lustre_user.h>
 
+#ifndef INVALID_UID
 #define INVALID_UID     (-1)
+#endif
 
 /** @} cfg */