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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to