diff options
| author | Arkadiusz Bubała <[email protected]> | 2017-11-10 22:37:10 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-11-10 13:37:10 -0800 |
| commit | c0daec32f839f687a7b631ea8c292dfb2637478a (patch) | |
| tree | d6a951ff43a7a39e2448a9510c4623f3fc512c0e /module/zfs/zfs_vfsops.c | |
| parent | 62df1bc813e6972130fffa91c6999a8e5ef80afd (diff) | |
Long hold the dataset during upgrade
If the receive or rollback is performed while filesystem is upgrading
the objset may be evicted in `dsl_dataset_clone_swap_sync_impl`. This
will lead to NULL pointer dereference when upgrade tries to access
evicted objset.
This commit adds long hold of dataset during whole upgrade process.
The receive and rollback will return an EBUSY error until the
upgrade is not finished.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Arkadiusz Bubała <[email protected]>
Closes #5295
Closes #6837
Diffstat (limited to 'module/zfs/zfs_vfsops.c')
| -rw-r--r-- | module/zfs/zfs_vfsops.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index 33557157b..af5593c2e 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -834,8 +834,13 @@ zfs_fuid_overobjquota(zfsvfs_t *zfsvfs, boolean_t isgroup, uint64_t fuid) int err; if (!dmu_objset_userobjspace_present(zfsvfs->z_os)) { - if (dmu_objset_userobjspace_upgradable(zfsvfs->z_os)) + if (dmu_objset_userobjspace_upgradable(zfsvfs->z_os)) { + dsl_pool_config_enter( + dmu_objset_pool(zfsvfs->z_os), FTAG); dmu_objset_userobjspace_upgrade(zfsvfs->z_os); + dsl_pool_config_exit( + dmu_objset_pool(zfsvfs->z_os), FTAG); + } return (B_FALSE); } |