Revert "blockdev: Remove the --setbsz (set blocksize) option which has never worked."

This reverts commit b1555acc2f709ac4f3b1e6c686a11cadb7b04f72.

It seems that the option is used by kernel guys to test kernel, so
let's keep the option in the blockdev(8) although it's almost useless
in userspace. All we need is to improve docs to make things more
obvious to end users.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/bash-completion/blockdev b/bash-completion/blockdev
index 5889955626e2da0f7f3d323f99b63c201294d0ac..ce986cb45fc0f50eca053c3258417237eaabb6c4 100644 (file)
--- a/bash-completion/blockdev
+++ b/bash-completion/blockdev
@@ -19,6 +19,7 @@ _blockdev_module()
                --getalignoff
                --getmaxsect
                --getbsz
+               --setbsz
                --getsize64
                --setra
                --getra
@@ -28,7 +29,11 @@ _blockdev_module()
                --rereadpt
                $DEVS"
        case $prev in
-               '--setfra')
+               '--setbsz')
+                       COMPREPLY=( $(compgen -W "bytes" -- $cur) )
+                       return 0
+                       ;;
+               '--setbsz'|'--setfra')
                        COMPREPLY=( $(compgen -W "sectors" -- $cur) )
                        return 0
                        ;;

diff --git a/disk-utils/blockdev.8 b/disk-utils/blockdev.8
index 6ab43249f167a4cf817ca7274021c5815262a4fc..2b3d64c88f3d5e0d876ea4b1273175e478c36042 100644 (file)
--- a/disk-utils/blockdev.8
+++ b/disk-utils/blockdev.8
@@ -67,6 +67,8 @@ Print sectorsize in bytes - usually 512.
 Get size in 512-byte sectors.
 .IP "\fB\-\-rereadpt\fP"
 Reread partition table
+.IP "\fB\-\-setbsz\fP \fIbytes\fP"
+Set blocksize.
 .IP "\fB\-\-setfra\fP \fIsectors\fP"
 Set filesystem readahead (same like --setra on 2.6 kernels).
 .IP "\fB\-\-setra\fP \fIsectors\fP"

diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index dc02d48c0f7057070d1c07db7a7de06d49495f8b..4543818bd4f90dedcc9a4e6c19e7865afc1d7741 100644 (file)
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -121,6 +121,13 @@ static const struct bdc bdcms[] =
                .argtype = ARG_INT,
                .argval = -1,
                .help = N_("get blocksize")
+       },{
+               IOCTL_ENTRY(BLKBSZSET),
+               .name = "--setbsz",
+               .argname = "<bytes>",
+               .argtype = ARG_INT,
+               .flags = FL_NORESULT,
+               .help = N_("set blocksize")
        },{
                IOCTL_ENTRY(BLKGETSIZE),
                .name = "--getsize",