Project Quota on ZFS

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

diff --git a/module/zfs/zfs_replay.c b/module/zfs/zfs_replay.c
index bfba2fea0292b4a45a4166881c61d76fdc6e2752..e2ff0078935f6df5396c58cec553b86527f8d062 100644 (file)
--- a/module/zfs/zfs_replay.c
+++ b/module/zfs/zfs_replay.c
@@ -128,14 +128,25 @@ zfs_replay_xvattr(lr_attr_t *lrattr, xvattr_t *xvap)
                    ((*attrs & XAT0_AV_QUARANTINED) != 0);
        if (XVA_ISSET_REQ(xvap, XAT_CREATETIME))
                ZFS_TIME_DECODE(&xoap->xoa_createtime, crtime);
-       if (XVA_ISSET_REQ(xvap, XAT_AV_SCANSTAMP))
+       if (XVA_ISSET_REQ(xvap, XAT_AV_SCANSTAMP)) {
+               ASSERT(!XVA_ISSET_REQ(xvap, XAT_PROJID));
+
                bcopy(scanstamp, xoap->xoa_av_scanstamp, AV_SCANSTAMP_SZ);
+       } else if (XVA_ISSET_REQ(xvap, XAT_PROJID)) {
+               /*
+                * XAT_PROJID and XAT_AV_SCANSTAMP will never be valid
+                * at the same time, so we can share the same space.
+                */
+               bcopy(scanstamp, &xoap->xoa_projid, sizeof (uint64_t));
+       }
        if (XVA_ISSET_REQ(xvap, XAT_REPARSE))
                xoap->xoa_reparse = ((*attrs & XAT0_REPARSE) != 0);
        if (XVA_ISSET_REQ(xvap, XAT_OFFLINE))
                xoap->xoa_offline = ((*attrs & XAT0_OFFLINE) != 0);
        if (XVA_ISSET_REQ(xvap, XAT_SPARSE))
                xoap->xoa_sparse = ((*attrs & XAT0_SPARSE) != 0);
+       if (XVA_ISSET_REQ(xvap, XAT_PROJINHERIT))
+               xoap->xoa_projinherit = ((*attrs & XAT0_PROJINHERIT) != 0);
 }
 
 static int