+++ /dev/null
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * 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.
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- *
- * Copyright (c) 2011, 2012, Intel Corporation.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- */
-
-#ifndef _LINUX_OBD_SUPPORT
-#define _LINUX_OBD_SUPPORT
-
-#ifndef _OBD_SUPPORT
-#error Do not #include this file directly. #include <obd_support.h> instead
-#endif
-
-#ifdef __KERNEL__
-#ifdef CONFIG_X86
-#include <asm/cpufeature.h>
-#endif
-#include <asm/processor.h>
-#include <linux/seq_file.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/highmem.h>
-#include <linux/swap.h>
-#include <linux/lustre_compat25.h>
-#endif
-#include <libcfs/libcfs.h>
-#include <lustre/lustre_idl.h>
-
-
-#ifdef __KERNEL__
-# include <linux/types.h>
-# include <linux/blkdev.h>
-#else /* !__KERNEL__ */
-# define LTIME_S(time) (time)
-/* for obd_class.h */
-#endif /* __KERNEL__ */
-
-#endif
#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>
+#endif /* __KERNEL__ */
+
/** \defgroup cfg cfg
*
* @{
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)
{
{
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)
RETURN(0);
}
-#include <lustre/lustre_user.h>
-
-#ifndef INVALID_UID
-#define INVALID_UID (-1)
-#endif
-
/** @} cfg */
-#endif // _LUSTRE_CFG_H
+#endif /* _LUSTRE_CFG_H */
#ifndef _OBD_SUPPORT
#define _OBD_SUPPORT
+#ifndef __KERNEL__
+# error Userspace should not include obd_support.h.
+#endif /* !__KERNEL__ */
+
+#include <linux/atomic.h>
+#include <linux/highmem.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+
#include <libcfs/libcfs.h>
#include <lprocfs_status.h>
-
-#include <linux/obd_support.h>
+#include <lustre_handles.h>
/* global variables */
extern struct lprocfs_stats *obd_memory;
extern __u64 obd_memory_max(void);
extern __u64 obd_pages_max(void);
-#else
+#else /* LPROCFS */
extern __u64 obd_alloc;
extern __u64 obd_pages;
#define obd_memory_max() (obd_max_alloc)
#define obd_pages_max() (obd_max_pages)
-#endif
+#endif /* !LPROCFS */
#define OBD_DEBUG_MEMUSAGE (1)
#define OBD_ALLOC_FAIL_MASK ((1 << OBD_ALLOC_FAIL_BITS) - 1)
#define OBD_ALLOC_FAIL_MULT (OBD_ALLOC_FAIL_MASK / 100)
-#if defined(LUSTRE_UTILS) /* this version is for utils only */
-#define __OBD_MALLOC_VERBOSE(ptr, cptab, cpt, size, flags) \
-do { \
- (ptr) = (cptab) == NULL ? \
- kmalloc(size, flags | __GFP_ZERO) : \
- cfs_cpt_malloc(cptab, cpt, size, flags | __GFP_ZERO); \
- if (unlikely((ptr) == NULL)) { \
- CERROR("kmalloc of '" #ptr "' (%d bytes) failed at %s:%d\n", \
- (int)(size), __FILE__, __LINE__); \
- } else { \
- CDEBUG(D_MALLOC, "kmalloced '" #ptr "': %d at %p\n", \
- (int)(size), ptr); \
- } \
-} while (0)
-
-#else /* this version is for the kernel and liblustre */
#define OBD_FREE_RTN0(ptr) \
({ \
kfree(ptr); \
OBD_ALLOC_POST(ptr, size, "kmalloced"); \
} \
} while (0)
-#endif
#define OBD_ALLOC_GFP(ptr, size, gfp_mask) \
__OBD_MALLOC_VERBOSE(ptr, NULL, 0, size, gfp_mask)
* (and particularly to not set __GFP_FS, which is likely to cause some
* deadlock situations in our code).
*/
-# define __OBD_VMALLOC_VERBOSE(ptr, cptab, cpt, size) \
+#define __OBD_VMALLOC_VERBOSE(ptr, cptab, cpt, size) \
do { \
(ptr) = cptab == NULL ? \
__vmalloc(size, GFP_NOFS | __GFP_HIGHMEM | __GFP_ZERO, \
} \
} while(0)
-# define OBD_VMALLOC(ptr, size) \
+#define OBD_VMALLOC(ptr, size) \
__OBD_VMALLOC_VERBOSE(ptr, NULL, 0, size)
-# define OBD_CPT_VMALLOC(ptr, cptab, cpt, size) \
+#define OBD_CPT_VMALLOC(ptr, cptab, cpt, size) \
__OBD_VMALLOC_VERBOSE(ptr, cptab, cpt, size)
-#ifdef __KERNEL__
-
/* Allocations above this size are considered too big and could not be done
* atomically.
*
OBD_FREE(ptr, size); \
} while (0)
-#else /* !__KERNEL__ */
-
-#define OBD_ALLOC_LARGE(ptr, size) \
- OBD_ALLOC(ptr, size)
-#define OBD_CPT_ALLOC_LARGE(ptr, cptab, cpt, size) \
- OBD_ALLOC(ptr, size)
-#define OBD_FREE_LARGE(ptr, size) \
- OBD_FREE(ptr, size)
-
-#endif /* __KERNEL__ */
-
#ifdef CONFIG_DEBUG_SLAB
#define POISON(ptr, c, s) do {} while (0)
#define POISON_PTR(ptr) ((void)0)
#define POISON_PAGE(page, val) do { } while (0)
#endif
-#ifdef __KERNEL__
#define OBD_FREE(ptr, size) \
do { \
OBD_FREE_PRE(ptr, size, "kfreed"); \
POISON_PTR(ptr); \
} while(0)
-#else
-#define OBD_FREE(ptr, size) ((void)(size), free((ptr)))
-#define OBD_FREE_RCU(ptr, size, handle) (OBD_FREE(ptr, size))
-#endif /* ifdef __KERNEL__ */
-
#define OBD_VFREE(ptr, size) \
do { \
OBD_FREE_PRE(ptr, size, "vfreed"); \
git://git.whamcloud.com / fs / lustre-release.git / commitdiff