X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_cfg.h;h=0685df558ba4b3bd120b2cd6b2e792f059acbd46;hb=72057a3af19ee02d9a686bd7e7d074917e381310;hp=c558e9bb1a9ad3171b7d5387d19ac1043aa12e62;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_cfg.h b/lustre/include/lustre_cfg.h
index c558e9b..0685df5 100644
--- a/lustre/include/lustre_cfg.h
+++ b/lustre/include/lustre_cfg.h
@@ -15,11 +15,7 @@
  *
  * 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -44,6 +40,7 @@
 # include <obd_support.h>
 #else /* !__KERNEL__ */
 # include <malloc.h>
+# include <stdlib.h>
 #endif /* __KERNEL__ */
 
 /** \defgroup cfg cfg
@@ -116,6 +113,8 @@ enum lcfg_command_type {
 	LCFG_NODEMAP_DEL_SHKEY  = 0x00ce054, /**< delete shared key from cluster */
 	LCFG_NODEMAP_TEST_NID   = 0x00ce055, /**< test for nodemap membership */
 	LCFG_NODEMAP_TEST_ID	= 0x00ce056, /**< test uid/gid mapping */
+	LCFG_NODEMAP_SET_FILESET   = 0x00ce057, /**< set fileset */
+	LCFG_NODEMAP_DENY_UNKNOWN  = 0x00ce058, /**< deny squashed nodemap users */
 };
 
 struct lustre_cfg_bufs {
@@ -222,9 +221,14 @@ static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, __u32 index)
 	 * of data.  Try to use the padding first though.
 	 */
 	if (s[lcfg->lcfg_buflens[index] - 1] != '\0') {
-		size_t last = min((size_t)lcfg->lcfg_buflens[index],
-			       cfs_size_round(lcfg->lcfg_buflens[index]) - 1);
-		char lost = s[last];
+		size_t last = cfs_size_round(lcfg->lcfg_buflens[index]) - 1;
+		char lost;
+
+		/* Use the smaller value */
+		if (last > lcfg->lcfg_buflens[index])
+			last = lcfg->lcfg_buflens[index];
+
+		lost = s[last];
 		s[last] = '\0';
 		if (lost != '\0') {
 			CWARN("Truncated buf %d to '%s' (lost '%c'...)\n",