From: Xiao Yang <yangx.jy@cn.fujitsu.com>
Date: Thu, 30 Jul 2020 01:02:15 +0000 (-0400)
Subject: xfs_io: Remove redundant setting/check for lsattr/stat command
X-Git-Tag: v5.8.0-rc0~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e055f37a98c690a78a027a739c66bae7b73d4d1d;p=thirdparty%2Fxfsprogs-dev.git

xfs_io: Remove redundant setting/check for lsattr/stat command

lsattr/stat command can check exclusive options by argmax = 1
so the related setting/check is redundant.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/io/attr.c b/io/attr.c
index 181ff0895..fd82a2e73 100644
--- a/io/attr.c
+++ b/io/attr.c
@@ -198,10 +198,8 @@ lsattr_f(
 			break;
 		case 'a':
 			aflag = 1;
-			vflag = 0;
 			break;
 		case 'v':
-			aflag = 0;
 			vflag = 1;
 			break;
 		default:
diff --git a/io/stat.c b/io/stat.c
index 5f513e0dd..49c4c27c1 100644
--- a/io/stat.c
+++ b/io/stat.c
@@ -142,11 +142,6 @@ stat_f(
 		}
 	}
 
-	if (raw && verbose) {
-		exitcode = 1;
-		return command_usage(&stat_cmd);
-	}
-
 	if (fstat(file->fd, &st) < 0) {
 		perror("fstat");
 		exitcode = 1;