Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Li Dongyang <dongyangli@ddn.com>
To:     linux-ext4@vger.kernel.org
Cc:     adilger@dilger.ca, lczerner@redhat.com
Subject: [PATCH] tune2fs: fall back to old get/set fs label on error
Date:   Sat, 20 May 2023 20:43:29 +1000
Message-Id: <20230520104329.2402182-1-dongyangli@ddn.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KRhRE9JoWH9AcY2g4CGdI1CpkcuUdudmVodOry+s2WaIlpckvzOfTPvHYj0x?=
 =?us-ascii?Q?STB0iud4h4YCYJb8e/v4w0Dk18zJF5BI3EDAzhIideo4mmjdQ23l6Qhddy2G?=
 =?us-ascii?Q?Y0Ct5jOW6AvVchcqG1gPsekQfVbAu+vnXp1GTEirw3WST6v6LmJW+rV7vowb?=
 =?us-ascii?Q?qubOQbZyh4aeovTqEFLpQ+Pr7KVzEI4mXiIRN7SxqqDuCSTObc7xuQPxwpOV?=
 =?us-ascii?Q?k1r/wiJmZfTa0hrbxLvjiawKM1Wwq40Rw+0v14pD2/SxR0cKPZujLxZOikQe?=
 =?us-ascii?Q?NXrlKRLdAlpIUca9yOljH94x3Fl2CG4QRacGXUaTa/YSeNu3HHtFsVECxdFs?=
 =?us-ascii?Q?WMG7wVZarsRXqU3+LgBGMXVz+NadNmwunEb5zm7XxfPtrMyfU07ca9Gn43eY?=
 =?us-ascii?Q?8BBOLplxBsaQm4hf4HyEPOK30V6NUwza+LYt7/wHb5x2ciQnAUCqQiIIklew?=
 =?us-ascii?Q?//681tjV9dZCiLvR1i6PRs9x25Mlq5BvoXDHK72KCVmF4s66bwycwI4tBJxL?=
 =?us-ascii?Q?9Sm40JGgDXFsEs0rQjjvEEtpRAvwepOXhyNaqmddnvD0uvlHaWcI8BXVBeoO?=
 =?us-ascii?Q?pzXgcBXX/MnDaqxU6k5I6wyLuDKezyCwy7UFkQG44xOqex6MaR0Ie9AQffGQ?=
 =?us-ascii?Q?WRfGc6ZDAJTbOU0NIpvirL8N5ZkpILQS2dPK6FDDBmLFJcbNxh/P1r/vy2Bi?=
 =?us-ascii?Q?qfr+YKDxqYbw0q3M7998oyV+fvQvlcnHU2U60txNxZfllE9AlBgfnAW5RAeU?=
 =?us-ascii?Q?WW2WDRY6mY21E6zgjmtRZBKGTnYumVSQTdWHLjuY45lCjvA1I+0Droc2zOLS?=
 =?us-ascii?Q?gpjURjxp9KaWbCeydRzh8U+ZEWvmYzoLoFS5ME3zq/c7lvNq/UmMNt3k5j6y?=
 =?us-ascii?Q?vFe5WIrtGbfIQ4UHandU1ws96WXl0Cn8IrbljBlWXysCW7HohkLrg+tU+4wq?=
 =?us-ascii?Q?qW9pSuimMCJ/VtHEs2H4po9v43tK+Mp8JsyY2ccIVXh0OZfmwmPU4jHNqeGC?=
 =?us-ascii?Q?pZkuMCNcBO/s8XwsN4JPNanekJX4a7xDC0JbZjSUA131l0BPmb+l+IAnzi8g?=
 =?us-ascii?Q?qr7C6prMNf+3zH9v8RNGIvdoqX4B3ekIeggTrR1UNP4nddlReMalXUJrkgJK?=
 =?us-ascii?Q?/JFZv683HsZPW7lbpEfMHK07XomRMnCHSZTsCHKfT24Rl6xgtJ67RFE+mJcA?=
 =?us-ascii?Q?y5sjLsuO71ap8S4Jztgict1X+mazKTUaCM0YzArIrU8VMl/cS55xXfxolF9V?=
 =?us-ascii?Q?aWPcFvo2einRckCPEnu3U0ItIAj5r7Mw5loQv1ytDJLfz5hMtWIiEuEStSBa?=
 =?us-ascii?Q?fx8ZxlOOkwYtnlQ8ZA7Mwo7+O3ZgZXCKaqk1tX6ONV5UwjK4mcbqtXg2+TPq?=
 =?us-ascii?Q?IxkZDbefutwO9/zTgZtwiSCLrJxwqicFNYT7uN+WpU3KQy/fQv1PegbUtJYv?=
 =?us-ascii?Q?kKgfOQmJSpok0oDFn8R/AONJPO3PI31bTPpO2TAMMpXiL5whJwQ9ptluFCbb?=
 =?us-ascii?Q?th/ZhkyvBV4kEziz6anE52kewTiWsQCLwpKAMKlGkF1o7BQEKvhqSf2IysXg?=
 =?us-ascii?Q?DJL/XGWuagvcvtPLdmI=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ZKGCnMInvTDO7w3HBU26KhyVX4t6sxbE7FW89DKHXBH2F2ayJzMLFJ3BpBRzZ+tmDnFF8/4/8FlHy58mXUQzMWZI9xpPgHoCSaafdVySCf8itEqPTQPPZASo0buLE9PhxtLW/cZsoVSeSEi8iH5enL1nir1B9JUqolYetMfPliuK9clKTr+sGmsDkH+hB/WNgHjOKYHHyJZ1OmlJxE6XhGdAlneuiqV7EA067u1zrUonUQQIWUypIoMDlFGVP84arhG9f80ETyxMwciLhxeiVex2tk3Rd6LjCRwlCUFor4zSQEms7FjS0wBlXa5aF658/hz9ovnc+M5qWS2uceCC0ztSkwNlyy5X5UP0BS0zdU1h26mmJDoB4ygUZVppSMxdOJcEeNbjg6F0ej72/xi1yIWrdeOm7gQL6M+s6Bk2+P/YQdiDVrpfH1eRvlPIKMU4ofVn7cqRijgDXyZADIfucPVzmXYWuh/xBLx5JBCDKMCuQ+oz38A+87q1R1dbFbgFO7lBJ2WC2mHr1y8c8Ghot7h3FlN5LPFMNogW/98PqkQ5Gsyj3oDBrZmkbT3vDKk0nO+2y6aFYSzzZBTyllssuxAspg8zyNajbtbjiw4etStuGIA2R20H+gFuHLGbF4BXqH1Y7fLYkUoppOpd9f/dKnvCZK7BcE3Bbrg3Y9OXCvfDjLW0MUGj9U4GOi70cdy6Tl5hAQ4YZ7maiDwpf5JjJFUPSg6es2u8Sjgkl08T1OWZ/sTOENRkxmp6LD5HSIV4cdMOHLtHG0uWcHbF6VSM/Wv2GXpceo4YwsNCrKnqkW1RxQBFaCp03GjVJ/DDeWgvzTmX6rbb0I8UuWC2u6CTTOzF/zJid4U2zwE3tf18yLc=
X-OriginatorOrg: ddn.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 53b51fb1-4959-45d1-5f8b-08db591f1a46
X-MS-Exchange-CrossTenant-AuthSource: BL1PR19MB5700.namprd19.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2023 10:43:52.4620
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 753b6e26-6fd3-43e6-8248-3f1735d59bb4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0EyFZ3P6PHUbKYgku3M7HjrehHHoyHvtjPzTMGlg6BgvLsT9GTWXKJrG1+Ro/xiv
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR19MB7020
X-BESS-ID: 1684581417-103934-30571-194134-1
X-BESS-VER: 2019.3_20230516.0025
X-BESS-Apparent-Source-IP: 104.47.58.168
X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVoaGFpZAVgZQ0Cg11SDVLDnR0D
        DNIs3S3NjC3MTUwszIOMXSwNjYIslMqTYWALwyMGxBAAAA
X-BESS-Outbound-Spam-Score: 0.00
X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.248281 [from 
        cloudscan19-178.us-east-2b.ess.aws.cudaops.com]
        Rule breakdown below
         pts rule name              description
        ---- ---------------------- --------------------------------
        0.00 BSF_BESS_OUTBOUND      META: BESS Outbound 
X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS124931 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND
X-BESS-BRTS-Status: 1
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,
        SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-ext4.vger.kernel.org>
X-Mailing-List: linux-ext4@vger.kernel.org

If we fail to get/open the mount point for get/set
fs label ioctl, just fall back to old method and
silence the error messages.

Fixes: f85b4526f ("tune2fs: implement support for set/get label iocts")
Signed-off-by: Li Dongyang <dongyangli@ddn.com>
---
 misc/tune2fs.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 458f7cf6a..460d81c9e 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -3096,24 +3096,19 @@ static int handle_fslabel(int setlabel)
 
 	ret = ext2fs_check_mount_point(device_name, &mnt_flags,
 					  mntpt, sizeof(mntpt));
-	if (ret) {
-		com_err(device_name, ret, _("while checking mount status"));
-		return 1;
-	}
+	if (ret)
+		return -1;
+
 	if (!(mnt_flags & EXT2_MF_MOUNTED) ||
 	    (setlabel && (mnt_flags & EXT2_MF_READONLY)))
 		return -1;
 
-	if (!mntpt[0]) {
-		fprintf(stderr,_("Unknown mount point for %s\n"), device_name);
-		return 1;
-	}
+	if (!mntpt[0])
+		return -1;
 
 	fd = open(mntpt, O_RDONLY);
-	if (fd < 0) {
-		com_err(mntpt, errno, _("while opening mount point"));
-		return 1;
-	}
+	if (fd < 0)
+		return -1;
 
 	/* Get fs label */
 	if (!setlabel) {
-- 
2.39.2