Date: Sun, 17 May 2009 20:16:38 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r192259 - in user/kmacy/ZFS_MFC: cddl/contrib/opensolaris/lib/libzpool/common/sys sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <200905172016.n4HKGctP038538@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Sun May 17 20:16:38 2009 New Revision: 192259 URL: http://svn.freebsd.org/changeset/base/192259 Log: define compat shim for M_ZERO Modified: user/kmacy/ZFS_MFC/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h user/kmacy/ZFS_MFC/sys/cddl/compat/opensolaris/sys/kmem.h user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: user/kmacy/ZFS_MFC/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- user/kmacy/ZFS_MFC/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sun May 17 19:51:08 2009 (r192258) +++ user/kmacy/ZFS_MFC/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sun May 17 20:16:38 2009 (r192259) @@ -301,6 +301,7 @@ extern void cv_broadcast(kcondvar_t *cv) */ #define KM_SLEEP UMEM_NOFAIL #define KM_PUSHPAGE KM_SLEEP +#define KM_ZERO 0 #define KM_NOSLEEP UMEM_DEFAULT #define KMC_NODEBUG UMC_NODEBUG #define kmem_alloc(_s, _f) umem_alloc(_s, _f) Modified: user/kmacy/ZFS_MFC/sys/cddl/compat/opensolaris/sys/kmem.h ============================================================================== --- user/kmacy/ZFS_MFC/sys/cddl/compat/opensolaris/sys/kmem.h Sun May 17 19:51:08 2009 (r192258) +++ user/kmacy/ZFS_MFC/sys/cddl/compat/opensolaris/sys/kmem.h Sun May 17 20:16:38 2009 (r192259) @@ -40,6 +40,7 @@ #define KM_SLEEP M_WAITOK #define KM_PUSHPAGE M_WAITOK #define KM_NOSLEEP M_NOWAIT +#define KM_ZERO M_ZERO #define KMC_NODEBUG 0 typedef struct kmem_cache { Modified: user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun May 17 19:51:08 2009 (r192258) +++ user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun May 17 20:16:38 2009 (r192259) @@ -2965,7 +2965,7 @@ arc_release(arc_buf_t *buf, void *tag) mutex_exit(hash_lock); - nhdr = kmem_cache_alloc(hdr_cache, KM_PUSHPAGE|M_ZERO); + nhdr = kmem_cache_alloc(hdr_cache, (KM_PUSHPAGE|KM_ZERO)); nhdr->b_size = blksz; nhdr->b_spa = spa; nhdr->b_type = type;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905172016.n4HKGctP038538>