diff options
author | Martin Matuska <mm@FreeBSD.org> | 2021-03-03 01:15:33 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2021-03-03 01:15:33 +0000 |
commit | caed7b1c399de04279822028e15b36367e84232f (patch) | |
tree | 11a8e01977837b40590b640f9bb404a5aca4ee85 /sys/contrib/openzfs/module/os/linux | |
parent | df3747c6607be12d48db825653e6adfc3041e97f (diff) | |
parent | 154ce66101db0e1a9c90a94e391612b2ab8c048f (diff) | |
download | src-caed7b1c399de04279822028e15b36367e84232f.tar.gz src-caed7b1c399de04279822028e15b36367e84232f.zip |
Diffstat (limited to 'sys/contrib/openzfs/module/os/linux')
-rw-r--r-- | sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c | 4 | ||||
-rw-r--r-- | sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c | 2 | ||||
-rw-r--r-- | sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c b/sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c index b373f2c2e83c..ff71ef4cd065 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c @@ -494,7 +494,11 @@ vdev_blkg_tryget(struct blkcg_gq *blkg) static inline void vdev_bio_associate_blkg(struct bio *bio) { +#if defined(HAVE_BIO_BDEV_DISK) + struct request_queue *q = bio->bi_bdev->bd_disk->queue; +#else struct request_queue *q = bio->bi_disk->queue; +#endif ASSERT3P(q, !=, NULL); ASSERT3P(bio->bi_blkg, ==, NULL); diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c b/sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c index b88e0497d000..6f5cff1770e1 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c @@ -209,7 +209,7 @@ zfs_max_nvlist_src_size_os(void) if (zfs_max_nvlist_src_size != 0) return (zfs_max_nvlist_src_size); - return (KMALLOC_MAX_SIZE); + return (MIN(ptob(zfs_totalram_pages) / 4, 128 * 1024 * 1024)); } void diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c index 0caf31307718..0d62b1490702 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c @@ -307,8 +307,12 @@ zvol_request(struct request_queue *q, struct bio *bio) #endif { #ifdef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS +#if defined(HAVE_BIO_BDEV_DISK) + struct request_queue *q = bio->bi_bdev->bd_disk->queue; +#else struct request_queue *q = bio->bi_disk->queue; #endif +#endif zvol_state_t *zv = q->queuedata; fstrans_cookie_t cookie = spl_fstrans_mark(); uint64_t offset = BIO_BI_SECTOR(bio) << 9; |