Skip to contentSkip to conversation

tune2fs: fall back to old get/set fs label on error

PATCH Applied Li Dongyang 2 participants 2 messages May 20, 2023 – Dec 7, 2023

lore
Share & tools
lore

Li Dongyang

author
#0 lore raw

PATCH 1/1 tune2fs: fall back to old get/set fs label on error

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 <[email protected]>
---
 misc/tune2fs.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)
misc/tune2fs.c +7 -12
index 458f7cf6a..460d81c9e 100644
@@ -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) {
Signature · 1 line
2.39.2
Applied
#1 lore raw
Quoted 5 lines · Li Dongyang

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.

Applied, thanks!

[1/1] tune2fs: fall back to old get/set fs label on error

      commit: 569074c65d7b3a2022e53f0d6abd405dbe5320a3

Best regards,

Signature · 1 line
Theodore Ts'o <[email protected]>