Prevent user accounting on readonly pool

[mirror_zfs.git] / module / zfs / dmu_objset.c

diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
index fa80e3a6181a3284b98d7d6b0facfcc64977c4cf..f95915b9e253b4da9527bf0901b06994b446b472 100644 (file)
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@ -2433,7 +2433,8 @@ dmu_objset_userobjspace_upgradable(objset_t *os)
        return (dmu_objset_type(os) == DMU_OST_ZFS &&
            !dmu_objset_is_snapshot(os) &&
            dmu_objset_userobjused_enabled(os) &&
-           !dmu_objset_userobjspace_present(os));
+           !dmu_objset_userobjspace_present(os) &&
+           spa_writeable(dmu_objset_spa(os)));
 }
 
 boolean_t
@@ -2442,7 +2443,8 @@ dmu_objset_projectquota_upgradable(objset_t *os)
        return (dmu_objset_type(os) == DMU_OST_ZFS &&
            !dmu_objset_is_snapshot(os) &&
            dmu_objset_projectquota_enabled(os) &&
-           !dmu_objset_projectquota_present(os));
+           !dmu_objset_projectquota_present(os) &&
+           spa_writeable(dmu_objset_spa(os)));
 }
 
 void