diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-12-12 10:11:48 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-12-12 10:11:48 -0500 |
| commit | 1e522014629a0351696260af4326b143ec628f8c (patch) | |
| tree | ab8b9431571589aa7c840243bfaeae43158467b0 | |
| parent | 98031cc62132803b5585700c7168df5fa2263ed1 (diff) | |
| parent | 1a6cb65e56b7b748d076735cbdfa3d4dddec8ea9 (diff) | |
| download | illumos-joyent-1e522014629a0351696260af4326b143ec628f8c.tar.gz | |
[illumos-gate merge]
commit 1a6cb65e56b7b748d076735cbdfa3d4dddec8ea9
15247 zfs_acl_chmod_aclmode_001_pos: tar extracts files in wrong directory
commit d67e8fd81d2058a6f9e67cc94c55a7dd9ceb6780
15225 Want bigger virtio 9P buffers
| -rw-r--r-- | usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/io/vio9p/vio9p_impl.h | 16 |
2 files changed, 15 insertions, 4 deletions
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh index 764bc879fd..6a56ea2779 100644 --- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh @@ -477,6 +477,7 @@ typeset target typeset -i passthrough=0 typeset -i flag=0 +cd $TESTDIR for mode in "${aclmode_flag[@]}"; do log_must zfs set aclmode=$mode $TESTPOOL/$TESTFS @@ -512,7 +513,7 @@ for mode in "${aclmode_flag[@]}"; do done done # Archive the file and directory - log_must tar cpf@ $TARFILE $basedir + log_must tar cpf@ $TARFILE ${basedir#$TESTDIR/} if [[ -d $obj ]]; then target=$odir diff --git a/usr/src/uts/common/io/vio9p/vio9p_impl.h b/usr/src/uts/common/io/vio9p/vio9p_impl.h index f8718c1ed2..74cb5bef15 100644 --- a/usr/src/uts/common/io/vio9p/vio9p_impl.h +++ b/usr/src/uts/common/io/vio9p/vio9p_impl.h @@ -62,8 +62,18 @@ extern "C" { /* * DRIVER PARAMETERS */ -#define VIRTIO_9P_MAX_REQS 16 -#define VIRTIO_9P_REQ_SIZE 8192 + +/* + * A limit on the number of requests that can be allocated for a vio9p device. + */ +#define VIRTIO_9P_MAX_REQS 8 + +/* + * This parameter defines an upper bound on 9P protocol message size (msize). 9P + * servers may negotiate an msize up to this value. An attempt to transfer a + * message larger than this will result in a EMSGISZE error. + */ +#define VIRTIO_9P_REQ_SIZE 65536 /* * It is not clear that there is a well-defined number of cookies for this @@ -72,7 +82,7 @@ extern "C" { * number that's large enough to ensure we'll be able to allocate without * requiring contiguous pages. */ -#define VIRTIO_9P_MAX_SGL 8 +#define VIRTIO_9P_MAX_SGL 64 /* * TYPE DEFINITIONS |