LU-6096 osd: mark directory's inode dirty

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

diff --git a/lustre/include/lustre_cfg.h b/lustre/include/lustre_cfg.h
index 29292df..71c65c3 100644 (file)
--- a/lustre/include/lustre_cfg.h
+++ b/lustre/include/lustre_cfg.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,6 +37,16 @@
 #ifndef _LUSTRE_CFG_H
 #define _LUSTRE_CFG_H
 
+#include <libcfs/libcfs.h>
+#include <lustre/lustre_user.h>
+
+#ifdef __KERNEL__
+# include <obd_support.h>
+#else /* !__KERNEL__ */
+# include <malloc.h>
+# include <stdlib.h>
+#endif /* __KERNEL__ */
+
 /** \defgroup cfg cfg
  *
  * @{
@@ -213,9 +223,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",
@@ -238,9 +253,6 @@ static inline __u32 lustre_cfg_len(__u32 bufcount, __u32 *buflens)
         RETURN(cfs_size_round(len));
 }
 
-
-#include <obd_support.h>
-
 static inline void lustre_cfg_init(struct lustre_cfg *lcfg, int cmd,
                                   struct lustre_cfg_bufs *bufs)
 {
@@ -263,24 +275,25 @@ static inline struct lustre_cfg *lustre_cfg_new(int cmd,
 {
        struct lustre_cfg       *lcfg;
 
-       ENTRY;
+#ifdef __KERNEL__
+       OBD_ALLOC(lcfg, lustre_cfg_len(bufs->lcfg_bufcount, bufs->lcfg_buflen));
+#else /* !__KERNEL__ */
+       lcfg = malloc(lustre_cfg_len(bufs->lcfg_bufcount, bufs->lcfg_buflen));
+#endif /* __KERNEL__ */
 
-       OBD_ALLOC(lcfg, lustre_cfg_len(bufs->lcfg_bufcount,
-                                      bufs->lcfg_buflen));
        if (lcfg != NULL)
                lustre_cfg_init(lcfg, cmd, bufs);
-       RETURN(lcfg);
+
+       return lcfg;
 }
 
 static inline void lustre_cfg_free(struct lustre_cfg *lcfg)
 {
-        int len;
-
-        len = lustre_cfg_len(lcfg->lcfg_bufcount, lcfg->lcfg_buflens);
-
-        OBD_FREE(lcfg, len);
-        EXIT;
-        return;
+#ifdef __KERNEL__
+       OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount, lcfg->lcfg_buflens));
+#else /* ! __KERNEL__ */
+       free(lcfg);
+#endif /* __KERNEL__ */
 }
 
 static inline int lustre_cfg_sanity_check(void *buf, size_t len)
@@ -311,12 +324,6 @@ static inline int lustre_cfg_sanity_check(void *buf, size_t len)
         RETURN(0);
 }
 
-#include <lustre/lustre_user.h>
-
-#ifndef INVALID_UID
-#define INVALID_UID     (-1)
-#endif
-
 /** @} cfg */
 
-#endif // _LUSTRE_CFG_H
+#endif /* _LUSTRE_CFG_H */