diff options
| author | jeff <jeff@FreeBSD.org> | 2013-06-19 02:30:32 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2013-06-19 02:30:32 +0000 |
| commit | b81bfe8f58d04781508f6dc459a35ec3d226b66c (patch) | |
| tree | 0951ab5f79577e98e4f91620f05d82d2d9b7336d /sys/vm/uma_core.c | |
| parent | deb0fb926fa3f216754efe07a3a169070dc31470 (diff) | |
| download | FreeBSD-src-b81bfe8f58d04781508f6dc459a35ec3d226b66c.zip FreeBSD-src-b81bfe8f58d04781508f6dc459a35ec3d226b66c.tar.gz | |
- 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
Diffstat (limited to 'sys/vm/uma_core.c')
| -rw-r--r-- | sys/vm/uma_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index fa1fd22..3e5ff0f 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -2418,7 +2418,7 @@ zone_alloc_bucket(uma_zone_t zone, int flags) 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); |
