[Ocfs2-devel] [PATCH 11/30] ocfs2: Handle missing dtors in kmem_cache_create()

[Joel Becker <Joel.Becker@oracle.com>]

On Thu, Dec 20, 2007 at 03:29:28PM -0800, Sunil Mushran wrote:
> Commit 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac removed the dtor arg
> from kmem_cache_create(). This patch allows one to build ocfs2 with
> kernels having/not having this change.

	I desperately want to come up with a trick here that will leave
"kmem_cache_create()" in the source, but I can't think of one.  This is
probably as good as we're going to get.

Joel
 
> Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
> ---
>  Config.make.in             |    1 +
>  Makefile                   |    3 ++-
>  configure.in               |    6 ++++++
>  fs/ocfs2/Makefile          |    4 ++++
>  fs/ocfs2/dlm/Makefile      |    4 ++++
>  fs/ocfs2/dlm/dlmfs.c       |    2 +-
>  fs/ocfs2/dlm/dlmmaster.c   |    2 +-
>  fs/ocfs2/super.c           |    2 +-
>  fs/ocfs2/uptodate.c        |    2 +-
>  kapi-compat/include/slab.h |   10 ++++++++++
>  10 files changed, 31 insertions(+), 5 deletions(-)
>  create mode 100644 kapi-compat/include/slab.h
> 
> diff --git a/Config.make.in b/Config.make.in
> index 4f42cca..07c5a86 100644
> --- a/Config.make.in
> +++ b/Config.make.in
> @@ -61,6 +61,7 @@ DELAYED_WORK_DEFINED = @DELAYED_WORK_DEFINED@
>  
>  HAS_SYNC_MAPPING_RANGE  = @HAS_SYNC_MAPPING_RANGE@
>  HAS_F_PATH_DEFINED = @HAS_F_PATH_DEFINED@
> +KMEM_CACHE_CREATE_DTOR = @KMEM_CACHE_CREATE_DTOR@
>  
>  OCFS_DEBUG = @OCFS_DEBUG@
>  
> diff --git a/Makefile b/Makefile
> index 2a97e00..ae5947b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -15,7 +15,8 @@ KAPI_COMPAT_FILES = \
>  	kapi-compat/include/fpath.h \
>  	kapi-compat/include/kmod.h \
>  	kapi-compat/include/inc_nlink.h \
> -	kapi-compat/include/drop_nlink.h
> +	kapi-compat/include/drop_nlink.h \
> +	kapi-compat/include/slab.h
>  
>  PATCH_FILES =
>  
> diff --git a/configure.in b/configure.in
> index 81041fb..cb91de1 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -198,6 +198,12 @@ OCFS2_CHECK_KERNEL([drop_nlink() in fs.h], fs.h,
>    , drop_nlink_compat_header="drop_nlink.h", [^static inline void drop_nlink(])
>  KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $drop_nlink_compat_header"
>  
> +KMEM_CACHE_CREATE_DTOR=
> +OCFS2_CHECK_KERNEL([kmem_cache_create() with dtor arg in slab.h], slab.h,
> +  KMEM_CACHE_CREATE_DTOR=yes, , [^.*void (\*)(void \*, kmem_cache_t \*, unsigned long),])
> +AC_SUBST(KMEM_CACHE_CREATE_DTOR)
> +KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS slab.h"
> +
>  # using -include has two advantages:
>  #  the source doesn't need to know to include compat headers
>  #  the compat header file names don't go through the search path
> diff --git a/fs/ocfs2/Makefile b/fs/ocfs2/Makefile
> index b6c8d03..403c1c6 100644
> --- a/fs/ocfs2/Makefile
> +++ b/fs/ocfs2/Makefile
> @@ -37,6 +37,10 @@ ifdef HAS_F_PATH_DEFINED
>  EXTRA_CFLAGS += -DHAS_F_PATH_DEFINED
>  endif
>  
> +ifdef KMEM_CACHE_CREATE_DTOR
> +EXTRA_CFLAGS += -DKMEM_CACHE_CREATE_DTOR
> +endif
> +
>  #
>  # Since SUBDIRS means something to kbuild, define them safely.  Do not
>  # include trailing slashes.
> diff --git a/fs/ocfs2/dlm/Makefile b/fs/ocfs2/dlm/Makefile
> index b4fb8e3..628ab3d 100644
> --- a/fs/ocfs2/dlm/Makefile
> +++ b/fs/ocfs2/dlm/Makefile
> @@ -20,6 +20,10 @@ ifdef DELAYED_WORK_DEFINED
>  EXTRA_CFLAGS += -DDELAYED_WORK_DEFINED
>  endif
>  
> +ifdef KMEM_CACHE_CREATE_DTOR
> +EXTRA_CFLAGS += -DKMEM_CACHE_CREATE_DTOR
> +endif
> +
>  DLM_SOURCES =			\
>  	dlmast.c		\
>  	dlmconvert.c		\
> diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c
> index 4ce2dea..dc43923 100644
> --- a/fs/ocfs2/dlm/dlmfs.c
> +++ b/fs/ocfs2/dlm/dlmfs.c
> @@ -588,7 +588,7 @@ static int __init init_dlmfs_fs(void)
>  
>  	dlmfs_print_version();
>  
> -	dlmfs_inode_cache = kmem_cache_create("dlmfs_inode_cache",
> +	dlmfs_inode_cache = kapi_kmem_cache_create("dlmfs_inode_cache",
>  				sizeof(struct dlmfs_inode_private),
>  				0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
>  					SLAB_MEM_SPREAD),
> diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
> index 62e4a7d..a668840 100644
> --- a/fs/ocfs2/dlm/dlmmaster.c
> +++ b/fs/ocfs2/dlm/dlmmaster.c
> @@ -507,7 +507,7 @@ static void dlm_mle_node_up(struct dlm_ctxt *dlm,
>  
>  int dlm_init_mle_cache(void)
>  {
> -	dlm_mle_cache = kmem_cache_create("dlm_mle_cache",
> +	dlm_mle_cache = kapi_kmem_cache_create("dlm_mle_cache",
>  					  sizeof(struct dlm_master_list_entry),
>  					  0, SLAB_HWCACHE_ALIGN,
>  					  NULL);
> diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
> index a8f90a2..f5c424d 100644
> --- a/fs/ocfs2/super.c
> +++ b/fs/ocfs2/super.c
> @@ -1033,7 +1033,7 @@ static void ocfs2_inode_init_once(void *data,
>  
>  static int ocfs2_initialize_mem_caches(void)
>  {
> -	ocfs2_inode_cachep = kmem_cache_create("ocfs2_inode_cache",
> +	ocfs2_inode_cachep = kapi_kmem_cache_create("ocfs2_inode_cache",
>  				       sizeof(struct ocfs2_inode_info),
>  				       0,
>  				       (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
> diff --git a/fs/ocfs2/uptodate.c b/fs/ocfs2/uptodate.c
> index 4da8851..6248308 100644
> --- a/fs/ocfs2/uptodate.c
> +++ b/fs/ocfs2/uptodate.c
> @@ -546,7 +546,7 @@ void ocfs2_remove_from_cache(struct inode *inode,
>  
>  int __init init_ocfs2_uptodate_cache(void)
>  {
> -	ocfs2_uptodate_cachep = kmem_cache_create("ocfs2_uptodate",
> +	ocfs2_uptodate_cachep = kapi_kmem_cache_create("ocfs2_uptodate",
>  				  sizeof(struct ocfs2_meta_cache_item),
>  				  0, SLAB_HWCACHE_ALIGN, NULL);
>  	if (!ocfs2_uptodate_cachep)
> diff --git a/kapi-compat/include/slab.h b/kapi-compat/include/slab.h
> new file mode 100644
> index 0000000..239763f
> --- /dev/null
> +++ b/kapi-compat/include/slab.h
> @@ -0,0 +1,10 @@
> +#ifndef KAPI_SLAB_H
> +#define KAPI_SLAB_H
> +
> +#ifdef KMEM_CACHE_CREATE_DTOR
> +#define kapi_kmem_cache_create(a, b, c, d, e)	kmem_cache_create(a, b, c, d, e, NULL)
> +#else
> +#define kapi_kmem_cache_create(a, b, c, d, e)	kmem_cache_create(a, b, c, d, e)
> +#endif
> +
> +#endif
> -- 
> 1.5.2.5
> 
> 
> _______________________________________________
> Ocfs2-devel mailing list
> Ocfs2-devel@oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-devel

-- 

"Any man who is under 30, and is not a liberal, has not heart;
 and any man who is over 30, and is not a conservative, has no brains."
         - Sir Winston Churchill 

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127