X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=man%2Fintegritytab.xml;h=ebffeeb25e7bfced9afb64ef41d8a2284e5a976d;hb=13a69c120bc584e90f863f821710b3b5294cd206;hp=44da039ddecf9dce658a9d5c8ec9612b5e2c00a1;hpb=29084afd916a2f23b76d72fb0ae21bf2a9fc56d4;p=thirdparty%2Fsystemd.git

diff --git a/man/integritytab.xml b/man/integritytab.xml
index 44da039ddec..ebffeeb25e7 100644
--- a/man/integritytab.xml
+++ b/man/integritytab.xml
@@ -69,18 +69,25 @@
         <listitem><para>
         Allow the use of discard (TRIM) requests for the device.
         This option is available since the Linux kernel version 5.7.
-        </para></listitem>
+        </para>
+
+        <xi:include href="version-info.xml" xpointer="v250"/></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>no-journal</option></term>
+        <term><option>mode=(journal|bitmap|direct)</option></term>
 
         <listitem><para>
-        Disable the journal. Corresponds to the "direct writes" mode documented in
+        Enable journaled, bitmapped or direct (passthrough) mode. Journaled mode is the default when this option is not specified.
+        It provides safety against crashes, but can be slow because all data has to be written twice.
+        Bitmap mode is more efficient since it requires only a single write, but it is less reliable because if data corruption happens when the machine crashes, it may not be detected.
+        Direct mode disables the journal and the bitmap. Corresponds to the "direct writes" mode documented in
         <ulink url="https://docs.kernel.org/admin-guide/device-mapper/dm-integrity.html">the dm-integrity documentation</ulink>.
         Note that without a journal, if there is a crash, it is possible that the integrity tags and data will not match. If used, the journal-*
         options below will have no effect if passed.
-        </para></listitem>
+        </para>
+
+        <xi:include href="version-info.xml" xpointer="v254"/></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -89,7 +96,9 @@
         <listitem><para>
         Journal watermark in percent. When the journal percentage exceeds this watermark, the journal flush will be started.  Setting a value of
         "0%" uses default value.
-        </para></listitem>
+        </para>
+
+        <xi:include href="version-info.xml" xpointer="v250"/></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -98,7 +107,9 @@
         <listitem><para>
         Commit time in milliseconds. When this time passes (and no explicit flush operation was issued), the journal is written.  Setting a value of
         zero uses default value.
-        </para></listitem>
+        </para>
+
+        <xi:include href="version-info.xml" xpointer="v250"/></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -108,7 +119,9 @@
         Specify a separate block device that contains existing data. The second field specified in the
         integritytab for block device then will contain calculated integrity tags and journal for data-device,
         but not the end user data.
-        </para></listitem>
+        </para>
+
+        <xi:include href="version-info.xml" xpointer="v250"/></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -116,7 +129,9 @@
 
         <listitem><para>
         The algorithm used for integrity checking.  The default is crc32c. Must match option used during format.
-        </para></listitem>
+        </para>
+
+        <xi:include href="version-info.xml" xpointer="v250"/></listitem>
       </varlistentry>
     </variablelist>
 
@@ -161,12 +176,12 @@ data PARTUUID=5d4b1808-be76-774d-88af-03c4c3a41761 - allow-discards
 
   <refsect1>
     <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-integritysetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-integritysetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry project='die-net'><refentrytitle>integritysetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-    </para>
+    <para><simplelist type="inline">
+      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-integritysetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-integritysetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry project='die-net'><refentrytitle>integritysetup</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+    </simplelist></para>
   </refsect1>
 
 </refentry>