diff mbox series

debugfs: allow <inode> for ncheck

Message ID 20220301041031.74615-1-adilger@whamcloud.com
State Superseded
Headers show
Series debugfs: allow <inode> for ncheck | expand

Commit Message

Andreas Dilger March 1, 2022, 4:10 a.m. UTC 
If the arg string is of the form <ino>, allow it for ncheck.
Improve the error message, use "Invalid inode number" instead
of "Bad inode", which implies the inode content being bad.

Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---
 debugfs/ncheck.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Comments

Theodore Ts'o Aug. 13, 2022, 1:12 a.m. UTC | #1 
On Mon, Feb 28, 2022 at 09:10:31PM -0700, Andreas Dilger wrote:
> If the arg string is of the form <ino>, allow it for ncheck.
> Improve the error message, use "Invalid inode number" instead
> of "Bad inode", which implies the inode content being bad.
> 
> Signed-off-by: Li Dongyang <dongyangli@ddn.com>
> Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

Applied, thanks!

					- Ted
diff mbox series

Patch

diff --git a/debugfs/ncheck.c b/debugfs/ncheck.c
index 011f26de..3be4be19 100644
--- a/debugfs/ncheck.c
+++ b/debugfs/ncheck.c
@@ -134,9 +134,21 @@  void do_ncheck(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
 
 	iw.names_left = 0;
 	for (i=0; i < argc; i++) {
-		iw.iarray[i] = strtol(argv[i], &tmp, 0);
+		char *str = argv[i];
+		int len = strlen(str);
+
+		if ((len > 2) && (str[0] == '<') && (str[len-1] == '>')) {
+			str[len-1] = '\0';
+			str++;
+		}
+		iw.iarray[i] = strtol(str, &tmp, 0);
 		if (*tmp) {
-			com_err("ncheck", 0, "Bad inode - %s", argv[i]);
+			if (str != argv[i]) {
+				str--;
+				str[len-1] = '>';
+			}
+			com_err("ncheck", 0, "Invalid inode number - '%s'",
+				argv[i]);
 			goto error_out;
 		}
 		if (debugfs_read_inode(iw.iarray[i], &inode, *argv))