Skip to content

Commit c811659

Browse files
committed
pstore/blk: Fix kerndoc and redundancy on blkdev param
Remove redundant details of blkdev and fix up resulting kerndoc. Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Kees Cook <[email protected]>
1 parent 7bb9557 commit c811659

File tree

2 files changed

+8
-27
lines changed

2 files changed

+8
-27
lines changed

Documentation/admin-guide/pstore-blk.rst

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,18 @@ blkdev
4545
The block device to use. Most of the time, it is a partition of block device.
4646
It's required for pstore/blk. It is also used for MTD device.
4747

48-
It accepts the following variants for block device:
48+
When pstore/blk is built as a module, "blkdev" accepts the following variants:
4949

50-
1. <hex_major><hex_minor> device number in hexadecimal represents itself; no
51-
leading 0x, for example b302.
52-
#. /dev/<disk_name> represents the device number of disk
50+
1. /dev/<disk_name> represents the device number of disk
5351
#. /dev/<disk_name><decimal> represents the device number of partition - device
5452
number of disk plus the partition number
5553
#. /dev/<disk_name>p<decimal> - same as the above; this form is used when disk
5654
name of partitioned disk ends with a digit.
55+
56+
When pstore/blk is built into the kernel, "blkdev" accepts the following variants:
57+
58+
#. <hex_major><hex_minor> device number in hexadecimal representation,
59+
with no leading 0x, for example b302.
5760
#. PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF represents the unique id of
5861
a partition if the partition table provides it. The UUID may be either an
5962
EFI/GPT UUID, or refer to an MSDOS partition using the format SSSSSSSS-PP,

fs/pstore/blk.c

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,29 +58,7 @@ MODULE_PARM_DESC(best_effort, "use best effort to write (i.e. do not require sto
5858

5959
/*
6060
* blkdev - the block device to use for pstore storage
61-
*
62-
* Usually, this will be a partition of a block device.
63-
*
64-
* blkdev accepts the following variants, when built as a module:
65-
* 1) /dev/<disk_name> represents the device number of disk
66-
* 2) /dev/<disk_name><decimal> represents the device number
67-
* of partition - device number of disk plus the partition number
68-
* 3) /dev/<disk_name>p<decimal> - same as the above, that form is
69-
* used when disk name of partitioned disk ends on a digit.
70-
*
71-
* blkdev accepts the following variants when built into the kernel:
72-
* 1) <hex_major><hex_minor> device number in hexadecimal representation,
73-
* with no leading 0x, for example b302.
74-
* 2) PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF representing the
75-
* unique id of a partition if the partition table provides it.
76-
* The UUID may be either an EFI/GPT UUID, or refer to an MSDOS
77-
* partition using the format SSSSSSSS-PP, where SSSSSSSS is a zero-
78-
* filled hex representation of the 32-bit "NT disk signature", and PP
79-
* is a zero-filled hex representation of the 1-based partition number.
80-
* 3) PARTUUID=<UUID>/PARTNROFF=<int> to select a partition in relation to
81-
* a partition with a known unique id.
82-
* 4) <major>:<minor> major and minor number of the device separated by
83-
* a colon.
61+
* See Documentation/admin-guide/pstore-blk.rst for details.
8462
*/
8563
static char blkdev[80] = CONFIG_PSTORE_BLK_BLKDEV;
8664
module_param_string(blkdev, blkdev, 80, 0400);

0 commit comments

Comments
 (0)