Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9042def authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

Pull trivial updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  NTB: correct ntb_spad_count comment typo
  misc: ibmasm: fix typo in error message
  Remove references to dead make variable LINUX_INCLUDE
  Remove last traces of ikconfig.h
  treewide: Fix printk() message errors
  Documentation/device-mapper: s/getsize/getsz/
parents 6960d582 74dcba35

Documentation/device-mapper/delay.txt

+2 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ Example scripts 
[[

#!/bin/sh

# Create device delaying rw operation for 500ms

echo "0 `blockdev --getsize $1` delay $1 0 500" | dmsetup create delayed

echo "0 `blockdev --getsz $1` delay $1 0 500" | dmsetup create delayed

]]



[[

#!/bin/sh

# Create device delaying only write operation for 500ms and

# splitting reads and writes to different devices $1 $2

echo "0 `blockdev --getsize $1` delay $1 0 0 $2 0 500" | dmsetup create delayed

echo "0 `blockdev --getsz $1` delay $1 0 0 $2 0 500" | dmsetup create delayed

]]

Documentation/device-mapper/dm-crypt.txt

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ https://gitlab.com/cryptsetup/cryptsetup 
[[

#!/bin/sh

# Create a crypt device using dmsetup

dmsetup create crypt1 --table "0 `blockdev --getsize $1` crypt aes-cbc-essiv:sha256 babebabebabebabebabebabebabebabe 0 $1 0"

dmsetup create crypt1 --table "0 `blockdev --getsz $1` crypt aes-cbc-essiv:sha256 babebabebabebabebabebabebabebabe 0 $1 0"

]]



[[

Documentation/device-mapper/linear.txt

+4 −4
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ Example scripts 
[[

#!/bin/sh

# Create an identity mapping for a device

echo "0 `blockdev --getsize $1` linear $1 0" | dmsetup create identity

echo "0 `blockdev --getsz $1` linear $1 0" | dmsetup create identity

]]





[[

#!/bin/sh

# Join 2 devices together

size1=`blockdev --getsize $1`

size2=`blockdev --getsize $2`

size1=`blockdev --getsz $1`

size2=`blockdev --getsz $2`

echo "0 $size1 linear $1 0

$size1 $size2 linear $2 0" | dmsetup create joined

]]
@@ -44,7 +44,7 @@ if (!defined($dev)) { 
        die("Please specify a device.\n");

}



my $dev_size = `blockdev --getsize $dev`;

my $dev_size = `blockdev --getsz $dev`;

my $extents = int($dev_size / $extent_size) -

              (($dev_size % $extent_size) ? 1 : 0);

Documentation/device-mapper/striped.txt

+2 −2
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ if (!$num_devs) { 
        die("Specify at least one device\n");

}



$min_dev_size = `blockdev --getsize $devs[0]`;

$min_dev_size = `blockdev --getsz $devs[0]`;

for ($i = 1; $i < $num_devs; $i++) {

        my $this_size = `blockdev --getsize $devs[$i]`;

        my $this_size = `blockdev --getsz $devs[$i]`;

        $min_dev_size = ($min_dev_size < $this_size) ?

                        $min_dev_size : $this_size;

}

Documentation/device-mapper/switch.txt

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ Assume that you have volumes vg1/switch0 vg1/switch1 vg1/switch2 with 
the same size.



Create a switch device with 64kB region size:

    dmsetup create switch --table "0 `blockdev --getsize /dev/vg1/switch0`

    dmsetup create switch --table "0 `blockdev --getsz /dev/vg1/switch0`

	switch 3 128 0 /dev/vg1/switch0 0 /dev/vg1/switch1 0 /dev/vg1/switch2 0"



Set mappings for the first 7 entries to point to devices switch0, switch1,