Skip to contentSkip to conversation

sys-utils: add blkverify command

PATCH New Chaitanya Kulkarni 1 participant 1 message Jun 30, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sys-utils: add blkverify command

---
 AUTHORS                                       |   1 +
 bash-completion/Makemodule.am                 |   3 +
 bash-completion/blkverify                     |  34 +++
 configure.ac                                  |   4 +
 include/blkdev.h                              |   4 +
 meson.build                                   |  12 +
 sys-utils/Makemodule.am                       |   9 +
 sys-utils/blkverify.8.adoc                    |  57 +++++
 sys-utils/blkverify.c                         | 207 ++++++++++++++++++
 sys-utils/fstrim.8.adoc                       |   1 +
 sys-utils/meson.build                         |   5 +
 tests/commands.sh                             |   1 +
 tests/expected/blkverify/offsets              |  48 ++++
 tests/expected/blkverify/offsets.err          |  20 ++
 tests/expected/build-sys/config-all           |   1 +
 tests/expected/build-sys/config-all-non-nls   |   1 +
 tests/expected/build-sys/config-audit         |   1 +
 .../expected/build-sys/config-chfnsh-libuser  |   1 +
 .../build-sys/config-chfnsh-no-password       |   1 +
 tests/expected/build-sys/config-chfnsh-pam    |   1 +
 tests/expected/build-sys/config-core          |   1 +
 tests/expected/build-sys/config-devel         |   1 +
 .../expected/build-sys/config-devel-non-asan  |   1 +
 .../expected/build-sys/config-devel-non-docs  |   1 +
 tests/expected/build-sys/config-non-libblkid  |   1 +
 tests/expected/build-sys/config-non-libmount  |   1 +
 tests/expected/build-sys/config-non-libs      |   1 +
 .../build-sys/config-non-libsmartcols         |   1 +
 tests/expected/build-sys/config-non-libuuid   |   1 +
 tests/expected/build-sys/config-non-nls       |   1 +
 tests/expected/build-sys/config-selinux       |   1 +
 tests/expected/build-sys/config-slang         |   1 +
 tests/expected/build-sys/config-static        |   1 +
 tests/ts/blkverify/offsets                    |  91 ++++++++
 34 files changed, 516 insertions(+)
 create mode 100644 bash-completion/blkverify
 create mode 100644 sys-utils/blkverify.8.adoc
 create mode 100644 sys-utils/blkverify.c
 create mode 100644 tests/expected/blkverify/offsets
 create mode 100644 tests/expected/blkverify/offsets.err
 create mode 100755 tests/ts/blkverify/offsets
AUTHORS +1 -0
index f0e88af19..3cf8f7452 100644
@@ -15,6 +15,7 @@ PAST MAINTAINERS:
 AUTHORS (merged projects & commands):
 
       blkdiscard:      Lukas Czerner <[email protected]>
+      blkverify:       Chaitanya Kulkarni <[email protected]>
       blkzone:         Shaun Tancheff <[email protected]>
                        Damien Le Moal <[email protected]>
       fallocate:       Eric Sandeen <[email protected]>
bash-completion/Makemodule.am +3 -0
index 5d59b5593..3857bd705 100644
@@ -279,6 +279,9 @@ endif
 if BUILD_BLKDISCARD
 dist_bashcompletion_DATA += bash-completion/blkdiscard
 endif
+if BUILD_BLKVERIFY
+dist_bashcompletion_DATA += bash-completion/blkverify
+endif
 if BUILD_BLKZONE
 dist_bashcompletion_DATA += bash-completion/blkzone
 endif
bash-completion/blkverify new file +34 -0
new file mode 100644
index 000000000..dcbae19b0
@@ -0,0 +1,34 @@
+_blkverify_module()
+{
+	local cur prev OPTS
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+	case $prev in
+		'-o'|'--offset'|'-l'|'--length'|'-p'|'--step')
+			COMPREPLY=( $(compgen -W "num" -- $cur) )
+			return 0
+			;;
+		'-h'|'--help'|'-V'|'--version')
+			return 0
+			;;
+	esac
+	case $cur in
+		-*)
+			OPTS="
+				--offset
+				--length
+				--step
+				--verbose
+				--help
+				--version
+			"
+			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+			return 0
+			;;
+	esac
+	compopt -o bashdefault -o default
+	COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+	return 0
+}
+complete -F _blkverify_module blkverify
configure.ac +4 -0
index 3ac79a503..050017cae 100644
@@ -1993,6 +1993,10 @@ UL_BUILD_INIT([blkdiscard], [check])
 UL_REQUIRES_LINUX([blkdiscard])
 AM_CONDITIONAL([BUILD_BLKDISCARD], [test "x$build_blkdiscard" = xyes])
 
+UL_BUILD_INIT([blkverify], [check])
+UL_REQUIRES_LINUX([blkverify])
+AM_CONDITIONAL([BUILD_BLKVERIFY], [test "x$build_blkverify" = xyes])
+
 UL_BUILD_INIT([blkzone], [check])
 UL_REQUIRES_LINUX([blkzone])
 UL_REQUIRES_HAVE([blkzone], [linux_blkzoned_h], [linux/blkzoned.h header])
include/blkdev.h +4 -0
index 43a5f5224..6b5683b99 100644
@@ -64,6 +64,10 @@
 #  define BLKDISCARDZEROES _IO(0x12,124)
 # endif
 
+# ifndef BLKVERIFY
+#  define BLKVERIFY _IO(0x12,129)
+# endif
+
 /* filesystem freeze, introduced in 2.6.29 (commit fcccf502) */
 # ifndef FIFREEZE
 #  define FIFREEZE   _IOWR('X', 119, int)    /* Freeze */
meson.build +12 -0
index 460c322e7..1c92d42b0 100644
@@ -1346,6 +1346,18 @@ exes += exe
 manadocs += ['sys-utils/blkdiscard.8.adoc']
 bashcompletions += ['blkdiscard']
 
+exe = executable(
+  'blkverify',
+  blkverify_sources,
+  include_directories : includes,
+  link_with : [lib_common,
+               lib_blkid],
+  install_dir : sbindir,
+  install : true)
+exes += exe
+manadocs += ['sys-utils/blkverify.8.adoc']
+bashcompletions += ['blkverify']
+
 exe = executable(
   'blkzone',
   blkzone_sources,
sys-utils/Makemodule.am +9 -0
index 22047d9bd..61daa3c23 100644
@@ -194,6 +194,15 @@ blkdiscard_CFLAGS += -I$(ul_libblkid_incdir)
 endif
 endif
 
+if BUILD_BLKVERIFY
+sbin_PROGRAMS += blkverify
+MANPAGES += sys-utils/blkverify.8
+dist_noinst_DATA += sys-utils/blkverify.8.adoc
+blkverify_SOURCES = sys-utils/blkverify.c lib/monotonic.c
+blkverify_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS)
+blkverify_CFLAGS = $(AM_CFLAGS)
+endif
+
 if BUILD_BLKZONE
 sbin_PROGRAMS += blkzone
 MANPAGES += sys-utils/blkzone.8
sys-utils/blkverify.8.adoc new file +57 -0

57 lines not on this page · raw message

sys-utils/blkverify.c new file +207 -0

207 lines not on this page · raw message

sys-utils/fstrim.8.adoc +1 -0
index 7accc4273..8f20a6311 100644
@@ -83,6 +83,7 @@ mailto:[email protected][Karel Zak]
 == SEE ALSO
 
 *blkdiscard*(8),
+*blkverify*(8),
 *mount*(8)
 
 include::man-common/bugreports.adoc[]
sys-utils/meson.build +5 -0
index 4b6cb7a1c..f27c8165b 100644
@@ -70,6 +70,11 @@ blkdiscard_sources = files(
 ) + \
   monotonic_c
 
+blkverify_sources = files(
+  'blkverify.c',
+) + \
+  monotonic_c
+
 blkzone_sources = files(
   'blkzone.c',
 )
tests/commands.sh +1 -0
index aff324c1f..a6db49339 100644
@@ -50,6 +50,7 @@ TS_HELPER_MKFDS="${ts_helpersdir}test_mkfds"
 TS_CMD_ADDPART=${TS_CMD_ADDPART:-"${ts_commandsdir}addpart"}
 TS_CMD_DELPART=${TS_CMD_DELPART:-"${ts_commandsdir}delpart"}
 TS_CMD_BLKDISCARD=${TS_CMD_BLKID-"${ts_commandsdir}blkdiscard"}
+TS_CMD_BLKVERIFY=${TS_CMD_BLKID-"${ts_commandsdir}blkverify"}
 TS_CMD_BLKID=${TS_CMD_BLKID-"${ts_commandsdir}blkid"}
 TS_CMD_CAL=${TS_CMD_CAL-"${ts_commandsdir}cal"}
 TS_CMD_COLCRT=${TS_CMD_COLCRT:-"${ts_commandsdir}colcrt"}
tests/expected/blkverify/offsets new file +48 -0

48 lines not on this page · raw message

tests/expected/blkverify/offsets.err new file +20 -0
new file mode 100644
index 000000000..8898aa149
@@ -0,0 +1,20 @@
+blkverify: offset 1 is not aligned to sector size 512
+blkverify: offset 511 is not aligned to sector size 512
+blkverify: length 5242881 is not aligned to sector size 512
+blkverify: length 5243391 is not aligned to sector size 512
+blkverify: offset 1 is not aligned to sector size 512
+blkverify: offset 511 is not aligned to sector size 512
+blkverify: offset 1 is not aligned to sector size 512
+blkverify: offset 1 is not aligned to sector size 512
+blkverify: offset 511 is not aligned to sector size 512
+blkverify: length 1 is not aligned to sector size 512
+blkverify: length 256 is not aligned to sector size 512
+blkverify: length 511 is not aligned to sector size 512
+blkverify: length 513 is not aligned to sector size 512
+blkverify: length 768 is not aligned to sector size 512
+blkverify: length 511 is not aligned to sector size 512
+blkverify: offset 1 is not aligned to sector size 512
+blkverify: offset 511 is not aligned to sector size 512
+blkverify: length 511 is not aligned to sector size 512
+blkverify: offset 1 is not aligned to sector size 512
+blkverify: offset 511 is not aligned to sector size 512
tests/expected/build-sys/config-all +1 -0
index cc09c6596..108a7f798 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-all-non-nls +1 -0
index cc09c6596..108a7f798 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-audit +1 -0
index 4031db086..548ba483d 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-chfnsh-libuser +1 -0
index 0059b3812..564aa5dc6 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-chfnsh-no-password +1 -0
index 35d5f722d..1aad8484d 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-chfnsh-pam +1 -0
index eae24a293..a7d7e8766 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-core +1 -0
index fed47bb64..33f7c38a0 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-devel +1 -0
index d80af4675..9fc453d04 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-devel-non-asan +1 -0
index d80af4675..9fc453d04 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-devel-non-docs +1 -0
index d80af4675..9fc453d04 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-non-libblkid +1 -0
index bc34d67e6..3ce1809ea 100644
@@ -1,4 +1,5 @@
 cfdisk:  libfdisk libncursesw libsmartcols libtinfo 
+blkverify:   
 column:  libsmartcols 
 fdisk:  libfdisk libreadline libsmartcols libtinfo 
 fincore:  libsmartcols 
tests/expected/build-sys/config-non-libmount +1 -0
index 890f7c2f9..cffdb0f42 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-non-libs +1 -0
index 5bf0e0c9d..018d7d96c 100644
@@ -1,5 +1,6 @@
 agetty:  
 blkdiscard:  
+blkverify:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
tests/expected/build-sys/config-non-libsmartcols +1 -0
index d58ec93c3..13fcba8ea 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 eject:  libmount 
 findfs:  libblkid 
tests/expected/build-sys/config-non-libuuid +1 -0
index 77912475c..373351d26 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 column:  libsmartcols 
 eject:  libmount 
tests/expected/build-sys/config-non-nls +1 -0
index fed47bb64..33f7c38a0 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-selinux +1 -0
index fcb55bda2..e9d637a9b 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-slang +1 -0
index 8eea3cf1c..fd6d1ee1e 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libslang libsmartcols libtinfo 
 column:  libsmartcols 
tests/expected/build-sys/config-static +1 -0
index 8d1b4b9b5..69c258c6a 100644
@@ -1,4 +1,5 @@
 blkdiscard:  libblkid 
+blkverify:   
 blkid:  libblkid 
 cfdisk:  libfdisk libmount libncursesw libsmartcols libtinfo 
 column:  libsmartcols 
tests/ts/blkverify/offsets new file +91 -0

91 lines not on this page · raw message

Signature · 1 line
2.29.0