Author: hselasky
Date: Sun Mar 4 18:04:37 2018
New Revision: 330387
URL: https://svnweb.freebsd.org/changeset/base/330387
Log:
Rename the SLAB_DESTROY_BY_RCU flag into SLAB_TYPESAFE_BY_RCU in the LinuxKPI
to be compatible with Linux.
MFC after: 1 week
Requested by: Johannes Lundberg <johal...@gmail.com>
Sponsored by: Mellanox Technologies
Modified:
head/sys/compat/linuxkpi/common/include/linux/slab.h
head/sys/compat/linuxkpi/common/src/linux_slab.c
Modified: head/sys/compat/linuxkpi/common/include/linux/slab.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/slab.h Sun Mar 4
18:00:32 2018 (r330386)
+++ head/sys/compat/linuxkpi/common/include/linux/slab.h Sun Mar 4
18:04:37 2018 (r330387)
@@ -79,7 +79,7 @@ struct linux_kmem_cache {
};
#define SLAB_HWCACHE_ALIGN (1 << 0)
-#define SLAB_DESTROY_BY_RCU (1 << 1)
+#define SLAB_TYPESAFE_BY_RCU (1 << 1)
#define SLAB_RECLAIM_ACCOUNT (1 << 2)
static inline gfp_t
@@ -162,7 +162,7 @@ extern void linux_kmem_cache_free_rcu(struct linux_kme
static inline void
linux_kmem_cache_free(struct linux_kmem_cache *c, void *m)
{
- if (unlikely(c->cache_flags & SLAB_DESTROY_BY_RCU))
+ if (unlikely(c->cache_flags & SLAB_TYPESAFE_BY_RCU))
linux_kmem_cache_free_rcu(c, m);
else
uma_zfree(c->cache_zone, m);
Modified: head/sys/compat/linuxkpi/common/src/linux_slab.c
==============================================================================
--- head/sys/compat/linuxkpi/common/src/linux_slab.c Sun Mar 4 18:00:32
2018 (r330386)
+++ head/sys/compat/linuxkpi/common/src/linux_slab.c Sun Mar 4 18:04:37
2018 (r330387)
@@ -49,7 +49,7 @@ linux_kmem_ctor(void *mem, int size, void *arg, int fl
{
struct linux_kmem_cache *c = arg;
- if (unlikely(c->cache_flags & SLAB_DESTROY_BY_RCU)) {
+ if (unlikely(c->cache_flags & SLAB_TYPESAFE_BY_RCU)) {
struct linux_kmem_rcu *rcu = LINUX_KMEM_TO_RCU(c, mem);
/* duplicate cache pointer */
@@ -85,7 +85,7 @@ linux_kmem_cache_create(const char *name, size_t size,
else if (align != 0)
align--;
- if (flags & SLAB_DESTROY_BY_RCU) {
+ if (flags & SLAB_TYPESAFE_BY_RCU) {
/* make room for RCU structure */
size = ALIGN(size, sizeof(void *));
size += sizeof(struct linux_kmem_rcu);
@@ -118,7 +118,7 @@ linux_kmem_cache_free_rcu(struct linux_kmem_cache *c,
void
linux_kmem_cache_destroy(struct linux_kmem_cache *c)
{
- if (unlikely(c->cache_flags & SLAB_DESTROY_BY_RCU)) {
+ if (unlikely(c->cache_flags & SLAB_TYPESAFE_BY_RCU)) {
/* make sure all free callbacks have been called */
rcu_barrier();
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
