Module Name: src
Committed By: hannken
Date: Mon Mar 18 09:19:39 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c
Log Message:
Change zfs_readdir() to use malloc() instead of kmem_alloc() to
allocate cookies. Required by protocol, caller uses free().
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.44 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.45
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.44 Tue Feb 5 09:54:36 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Mon Mar 18 09:19:39 2019
@@ -85,6 +85,7 @@
#include <miscfs/genfs/genfs_node.h>
#include <uvm/uvm_extern.h>
#include <sys/fstrans.h>
+#include <sys/malloc.h>
uint_t zfs_putpage_key;
#endif
@@ -2754,7 +2755,7 @@ zfs_readdir(vnode_t *vp, uio_t *uio, cre
#endif
#ifdef __NetBSD__
ncooks = uio->uio_resid / _DIRENT_MINSIZE(odp);
- cooks = kmem_alloc(ncooks * sizeof(off_t), KM_SLEEP);
+ cooks = malloc(ncooks * sizeof(off_t), M_TEMP, M_WAITOK);
#endif
*cookies = cooks;
*ncookies = ncooks;
