Project Quota on ZFS

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

diff --git a/module/zfs/dmu_traverse.c b/module/zfs/dmu_traverse.c
index 15d29198fb7e6ada7b722e9ede6a2c186e68ec34..5407e4817292473edb77b6811788595591a2f783 100644 (file)
--- a/module/zfs/dmu_traverse.c
+++ b/module/zfs/dmu_traverse.c
@@ -386,7 +386,11 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                if (osp->os_meta_dnode.dn_maxblkid == 0)
                        td->td_realloc_possible = B_FALSE;
 
-               if (arc_buf_size(buf) >= sizeof (objset_phys_t)) {
+               if (OBJSET_BUF_HAS_USERUSED(buf)) {
+                       if (OBJSET_BUF_HAS_PROJECTUSED(buf))
+                               prefetch_dnode_metadata(td,
+                                   &osp->os_projectused_dnode,
+                                   zb->zb_objset, DMU_PROJECTUSED_OBJECT);
                        prefetch_dnode_metadata(td, &osp->os_groupused_dnode,
                            zb->zb_objset, DMU_GROUPUSED_OBJECT);
                        prefetch_dnode_metadata(td, &osp->os_userused_dnode,
@@ -395,13 +399,19 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 
                err = traverse_dnode(td, &osp->os_meta_dnode, zb->zb_objset,
                    DMU_META_DNODE_OBJECT);
-               if (err == 0 && arc_buf_size(buf) >= sizeof (objset_phys_t)) {
-                       err = traverse_dnode(td, &osp->os_groupused_dnode,
-                           zb->zb_objset, DMU_GROUPUSED_OBJECT);
-               }
-               if (err == 0 && arc_buf_size(buf) >= sizeof (objset_phys_t)) {
-                       err = traverse_dnode(td, &osp->os_userused_dnode,
-                           zb->zb_objset, DMU_USERUSED_OBJECT);
+               if (err == 0 && OBJSET_BUF_HAS_USERUSED(buf)) {
+                       if (OBJSET_BUF_HAS_PROJECTUSED(buf))
+                               err = traverse_dnode(td,
+                                   &osp->os_projectused_dnode, zb->zb_objset,
+                                   DMU_PROJECTUSED_OBJECT);
+                       if (err == 0)
+                               err = traverse_dnode(td,
+                                   &osp->os_groupused_dnode, zb->zb_objset,
+                                   DMU_GROUPUSED_OBJECT);
+                       if (err == 0)
+                               err = traverse_dnode(td,
+                                   &osp->os_userused_dnode, zb->zb_objset,
+                                   DMU_USERUSED_OBJECT);
                }
        }