Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4199 libcfs: add wrapper of dump_trace()
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
user-mem.c
diff --git
a/libcfs/libcfs/user-mem.c
b/libcfs/libcfs/user-mem.c
index
615fa00
..
af1d09c
100644
(file)
--- a/
libcfs/libcfs/user-mem.c
+++ b/
libcfs/libcfs/user-mem.c
@@
-47,9
+47,9
@@
* Allocator
*/
* Allocator
*/
-
cfs_page_t *cfs_
alloc_page(unsigned int flags)
+
struct page *
alloc_page(unsigned int flags)
{
{
-
cfs_page_t
*pg = malloc(sizeof(*pg));
+
struct page
*pg = malloc(sizeof(*pg));
int rc = 0;
if (!pg)
int rc = 0;
if (!pg)
@@
-57,11
+57,11
@@
cfs_page_t *cfs_alloc_page(unsigned int flags)
pg->addr = NULL;
#if defined (__DARWIN__)
pg->addr = NULL;
#if defined (__DARWIN__)
-
pg->addr = valloc(CFS_PAG
E_SIZE);
+
pg->addr = valloc(PAGE_CACH
E_SIZE);
#elif defined (__WINNT__)
pg->addr = pgalloc(0);
#else
#elif defined (__WINNT__)
pg->addr = pgalloc(0);
#else
-
rc = posix_memalign(&pg->addr, CFS_PAGE_SIZE, CFS_PAG
E_SIZE);
+
rc = posix_memalign(&pg->addr, PAGE_CACHE_SIZE, PAGE_CACH
E_SIZE);
#endif
if (rc != 0 || pg->addr == NULL) {
free(pg);
#endif
if (rc != 0 || pg->addr == NULL) {
free(pg);
@@
-70,7
+70,7
@@
cfs_page_t *cfs_alloc_page(unsigned int flags)
return pg;
}
return pg;
}
-void
cfs_free_page(cfs_page_t
*pg)
+void
__free_page(struct page
*pg)
{
#if defined (__WINNT__)
pgfree(pg->addr);
{
#if defined (__WINNT__)
pgfree(pg->addr);
@@
-81,17
+81,17
@@
void cfs_free_page(cfs_page_t *pg)
free(pg);
}
free(pg);
}
-void *
cfs_page_address(cfs_page_t
*pg)
+void *
page_address(struct page
*pg)
{
return pg->addr;
}
{
return pg->addr;
}
-void *
cfs_kmap(cfs_page_t
*pg)
+void *
kmap(struct page
*pg)
{
return pg->addr;
}
{
return pg->addr;
}
-void
cfs_kunmap(cfs_page_t
*pg)
+void
kunmap(struct page
*pg)
{
}
{
}
@@
-99,10
+99,11
@@
void cfs_kunmap(cfs_page_t *pg)
* SLAB allocator
*/
* SLAB allocator
*/
-cfs_mem_cache_t *
-cfs_mem_cache_create(const char *name, size_t objsize, size_t off, unsigned long flags)
+struct kmem_cache *
+kmem_cache_create(const char *name, size_t objsize, size_t off,
+ unsigned long flags, void *ctor)
{
{
-
cfs_mem_cache_t
*c;
+
struct kmem_cache
*c;
c = malloc(sizeof(*c));
if (!c)
c = malloc(sizeof(*c));
if (!c)
@@
-113,21
+114,20
@@
cfs_mem_cache_create(const char *name, size_t objsize, size_t off, unsigned long
return c;
}
return c;
}
-
int cfs_mem_cache_destroy(cfs_mem_cache_t
*c)
+
void kmem_cache_destroy(struct kmem_cache
*c)
{
CDEBUG(D_MALLOC, "destroy slab cache %p, objsize %u\n", c, c->size);
free(c);
{
CDEBUG(D_MALLOC, "destroy slab cache %p, objsize %u\n", c, c->size);
free(c);
- return 0;
}
}
-void *
cfs_mem_cache_alloc(cfs_mem_cache_t
*c, int gfp)
+void *
kmem_cache_alloc(struct kmem_cache
*c, int gfp)
{
{
-
return cfs_
alloc(c->size, gfp);
+
return km
alloc(c->size, gfp);
}
}
-void
cfs_mem_cache_free(cfs_mem_cache_t
*c, void *addr)
+void
kmem_cache_free(struct kmem_cache
*c, void *addr)
{
{
-
cfs_
free(addr);
+
k
free(addr);
}
/**
}
/**
@@
-136,7
+136,7
@@
void cfs_mem_cache_free(cfs_mem_cache_t *c, void *addr)
* occasionally returns true for the incorrect addresses, but if it returns
* false, then the addresses is guaranteed to be incorrect.
*/
* occasionally returns true for the incorrect addresses, but if it returns
* false, then the addresses is guaranteed to be incorrect.
*/
-int
cfs_mem_is_in_cache(const void *addr, const cfs_mem_cache_t
*kmem)
+int
kmem_is_in_cache(const void *addr, const struct kmem_cache
*kmem)
{
return 1;
}
{
return 1;
}