design: incorporate the delayed logging design doc
Move the delayed logging design documentation into the design book.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
diff --git a/design/xfs-delayed-logging-design.asciidoc b/design/XFS_Filesystem_Structure/delayed_logging.asciidoc
similarity index 98%
rename from design/xfs-delayed-logging-design.asciidoc
rename to design/XFS_Filesystem_Structure/delayed_logging.asciidoc
index e54e786..e9a336f 100644
--- a/design/xfs-delayed-logging-design.asciidoc
+++ b/design/XFS_Filesystem_Structure/delayed_logging.asciidoc
@@ -1,6 +1,4 @@
-= XFS Delayed Logging Design
-Dave Chinner, <dchinner@redhat.com>
-v1.0, Feb 2014: Initial conversion to asciidoc
+= Delayed Logging
== Introduction to Re-logging in XFS
diff --git a/design/XFS_Filesystem_Structure/docinfo.xml b/design/XFS_Filesystem_Structure/docinfo.xml
index e13d705..558a04c 100644
--- a/design/XFS_Filesystem_Structure/docinfo.xml
+++ b/design/XFS_Filesystem_Structure/docinfo.xml
@@ -169,4 +169,18 @@
</simplelist>
</revdescription>
</revision>
+ <revision>
+ <revnumber>3.141592</revnumber>
+ <date>May 2018</date>
+ <author>
+ <firstname>Darrick</firstname>
+ <surname>Wong</surname>
+ <email>darrick.wong@oracle.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Incorporate Dave Chinner's log design document.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
</revhistory>
diff --git a/design/XFS_Filesystem_Structure/xfs_filesystem_structure.asciidoc b/design/XFS_Filesystem_Structure/xfs_filesystem_structure.asciidoc
index 8d54935..7bdfade 100644
--- a/design/XFS_Filesystem_Structure/xfs_filesystem_structure.asciidoc
+++ b/design/XFS_Filesystem_Structure/xfs_filesystem_structure.asciidoc
@@ -48,6 +48,8 @@
include::metadata_integrity.asciidoc[]
+include::delayed_logging.asciidoc[]
+
include::reflink.asciidoc[]
include::reconstruction.asciidoc[]