diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-11-08 08:16:01 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-11-08 08:17:55 +0000 |
| commit | 14c2e0a0c57e48a41433fdca668fac8882fb04df (patch) | |
| tree | 4ee3a4f7a498b69ab7e2eaf6402b273e6b3f2036 /sys/contrib/openzfs/module/os/linux/zfs | |
| parent | f25b0d6dd75d41cbb27d1cc40bb53185672281e0 (diff) | |
| parent | 9198de8f1079a8bbb837de3e3f8e236777b1375d (diff) | |
zfs: merge openzfs/zfs@9198de8f1
Notable upstream pull request merges:
#15197 3bd4df384 Improve ZFS objset sync parallelism
#15455 020f6fd09 FreeBSD: Implement taskq_init_ent()
#15476 3d86999c7 sa_lookup() ignores buffer size
#15478 2a154b848 Fix accounting error for pending sync IO ops in
zpool iostat
#15484 dc45a00ea Add kern.features.zfs
#15486 e36ff84c3 Update the kstat dataset_name when renaming a zvol
#15491 f4cd1bac7 Make abd_raidz_gen_iterate() pass an initialized
pointer to the callback
#15495 58398cbd0 FreeBSD: Optimize large kstat outputs
Obtained from: OpenZFS
OpenZFS commit: 9198de8f1079a8bbb837de3e3f8e236777b1375d
Diffstat (limited to 'sys/contrib/openzfs/module/os/linux/zfs')
| -rw-r--r-- | sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c index a1db5c57c18b..2792bc027213 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c @@ -1488,7 +1488,7 @@ zfs_domount(struct super_block *sb, zfs_mnt_t *zm, int silent) * read-only flag, pretend it was set, as done for snapshots. */ if (!canwrite) - vfs->vfs_readonly = true; + vfs->vfs_readonly = B_TRUE; error = zfsvfs_create(osname, vfs->vfs_readonly, &zfsvfs); if (error) { 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 fd0fd2c36dcd..384f5785a498 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c @@ -1528,6 +1528,8 @@ zvol_os_rename_minor(zvol_state_t *zv, const char *newname) */ set_disk_ro(zv->zv_zso->zvo_disk, !readonly); set_disk_ro(zv->zv_zso->zvo_disk, readonly); + + dataset_kstats_rename(&zv->zv_kstat, newname); } void |