From dfae1c63d504dc2063336c519f959f479213a0b4 Mon Sep 17 00:00:00 2001
From: Sami Tolvanen <samitolvanen@google.com>
Date: Mon, 29 Jun 2015 12:23:09 +0100
Subject: dm verity: port upstream changes to 3.10

Upstream dm-verity has different optional parameters. Port back the
relevant changes.

Bug: 21893453
Change-Id: I5431388e041d6829ad60d2c86dd113210ba6aff7
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
(cherry picked from commit 82cdd95a61c921c3c3063178c272b251573b596f)
---
 Documentation/device-mapper/verity.txt | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'Documentation')

diff --git a/Documentation/device-mapper/verity.txt b/Documentation/device-mapper/verity.txt
index 2929f6b1c..e15bc1a0f 100644
--- a/Documentation/device-mapper/verity.txt
+++ b/Documentation/device-mapper/verity.txt
@@ -10,7 +10,8 @@ Construction Parameters
     <version> <dev> <hash_dev>
     <data_block_size> <hash_block_size>
     <num_data_blocks> <hash_start_block>
-    <algorithm> <digest> <salt> <mode>
+    <algorithm> <digest> <salt>
+    [<#opt_params> <opt_params>]
 
 <version>
     This is the type of the on-disk hash format.
@@ -62,15 +63,21 @@ Construction Parameters
 <salt>
     The hexadecimal encoding of the salt value.
 
-<mode>
-    Optional. The mode of operation.
+<#opt_params>
+    Number of optional parameters. If there are no optional parameters,
+    the optional paramaters section can be skipped or #opt_params can be zero.
+    Otherwise #opt_params is the number of following arguments.
 
-    0 is the normal mode of operation where a corrupted block will result in an
-      I/O error.
+    Example of optional parameters section:
+        1 ignore_corruption
 
-    1 is logging mode where corrupted blocks are logged and a uevent is sent to
-      notify user space.
+ignore_corruption
+    Log corrupted blocks, but allow read operations to proceed normally.
 
+restart_on_corruption
+    Restart the system when a corrupted block is discovered. This option is
+    not compatible with ignore_corruption and requires user space support to
+    avoid restart loops.
 
 Theory of operation
 ===================
@@ -135,7 +142,7 @@ block boundary) are the hash blocks which are stored a depth at a time
 
 The full specification of kernel parameters and on-disk metadata format
 is available at the cryptsetup project's wiki page
-  http://code.google.com/p/cryptsetup/wiki/DMVerity
+  https://gitlab.com/cryptsetup/cryptsetup/wikis/DMVerity
 
 Status
 ======
@@ -152,7 +159,7 @@ Set up a device:
 
 A command line tool veritysetup is available to compute or verify
 the hash tree or activate the kernel device. This is available from
-the cryptsetup upstream repository http://code.google.com/p/cryptsetup/
+the cryptsetup upstream repository https://gitlab.com/cryptsetup/cryptsetup/
 (as a libcryptsetup extension).
 
 Create hash on the device:
-- 
cgit v1.2.3