Do not upgrade userobj accounting for snapshot dataset

'zfs recv' could disown a living objset without calling dmu_objset_disown(). This will cause the problem that the objset would be released while upgrading thread is still running. This patch avoids the problem by checking if a dataset is snapshot before calling dmu_objset_userobjspace_upgrade(). ZoL-bug-id: #5295 Signed-off-by: Jinshan Xiong <[email protected]>
openzfs · Oct 25, 2016 · 77ecb31 · 77ecb31
1 parent 24cdeaf
commit 77ecb31
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/include/sys/dmu_objset.h b/include/sys/dmu_objset.h
@@ -190,6 +190,7 @@ boolean_t dmu_objset_userobjspace_present(objset_t *os);
 static inline boolean_t 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));
 }