diff options
| author | Matt Macy <mmacy@FreeBSD.org> | 2021-01-07 23:27:17 +0000 |
|---|---|---|
| committer | Matt Macy <mmacy@FreeBSD.org> | 2021-01-08 00:55:59 +0000 |
| commit | 7877fdebeeb35fad1cbbafce22598b1bdf97c786 (patch) | |
| tree | 10ccc0bab059d6f48a221045b92416fc347fe784 /sys/contrib/openzfs/module/zfs/zcp.c | |
| parent | 84089de83e79a0f748c6e22b1aacb59156e153d2 (diff) | |
| download | src-7877fdebeeb35fad1cbbafce22598b1bdf97c786.tar.gz src-7877fdebeeb35fad1cbbafce22598b1bdf97c786.zip | |
OpenZFS merge main-gf11b09
- add dRAID support
- fix duplicate close handling
- fix memory leak in prefetch
- fix problem with SIMD benchmarking on FreeBSD boot
...
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/zcp.c')
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/zcp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/contrib/openzfs/module/zfs/zcp.c b/sys/contrib/openzfs/module/zfs/zcp.c index 793e0e4f0b75..1ad53eae1eef 100644 --- a/sys/contrib/openzfs/module/zfs/zcp.c +++ b/sys/contrib/openzfs/module/zfs/zcp.c @@ -722,8 +722,6 @@ static void * zcp_lua_alloc(void *ud, void *ptr, size_t osize, size_t nsize) { zcp_alloc_arg_t *allocargs = ud; - int flags = (allocargs->aa_must_succeed) ? - KM_SLEEP : (KM_NOSLEEP | KM_NORMALPRI); if (nsize == 0) { if (ptr != NULL) { @@ -746,10 +744,7 @@ zcp_lua_alloc(void *ud, void *ptr, size_t osize, size_t nsize) return (NULL); } - allocbuf = vmem_alloc(allocsize, flags); - if (allocbuf == NULL) { - return (NULL); - } + allocbuf = vmem_alloc(allocsize, KM_SLEEP); allocargs->aa_alloc_remaining -= allocsize; *allocbuf = allocsize; |