Date: Wed, 19 Jun 2013 02:30:33 +0000 (UTC) From: Jeff Roberson <jeff@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251983 - head/sys/vm Message-ID: <201306190230.r5J2UXSw019619@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jeff Date: Wed Jun 19 02:30:32 2013 New Revision: 251983 URL: http://svnweb.freebsd.org/changeset/base/251983 Log: - Persist the caller's flags in the bucket allocation flags so we don't lose a M_NOVM when we recurse into a bucket allocation. Sponsored by: EMC / Isilon Storage Division Modified: head/sys/vm/uma_core.c Modified: head/sys/vm/uma_core.c ============================================================================== --- head/sys/vm/uma_core.c Wed Jun 19 02:16:04 2013 (r251982) +++ head/sys/vm/uma_core.c Wed Jun 19 02:30:32 2013 (r251983) @@ -2418,7 +2418,7 @@ zone_alloc_bucket(uma_zone_t zone, int f int max; max = zone->uz_count; - bflags = M_NOWAIT; + bflags = (flags & ~M_WAITOK) | M_NOWAIT; if (zone->uz_flags & UMA_ZFLAG_CACHEONLY) bflags |= M_NOVM; bucket = bucket_alloc(zone->uz_count, bflags);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306190230.r5J2UXSw019619>