File util-linux-mount-reuse-loop-3.patch of Package util-linux-systemd.3352

Overview Repositories Revisions Requests Users Attributes Meta

File util-linux-mount-reuse-loop-3.patch of Package util-linux-systemd.3352

From b2c2c42a8e77a8b2eff2735b03b9a91a19c5e091 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.cz>
Date: Tue, 12 Apr 2016 20:23:25 +0200
Subject: [PATCH 3/4] mount: Handle EROFS before calling mount() syscall

If the loop device is already initialized read-only, the new code for loop
device reuse returns -EROFS. There is no solution of this situation. But mount
can behave in the same way, as it does for EROFS returned by mount syscall: Try
again in read-only mode.

Before:
mount: /mnt/2: mount failed: Read-only file system

After:
mount: /btrfs.img is used as read only loop, mounting read-only

Note: It would be nice to mention loop device name in the warning message, but
it is not available in the mount context.

Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>
---
 sys-utils/mount.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Index: util-linux-2.25/sys-utils/mount.c
===================================================================
--- util-linux-2.25.orig/sys-utils/mount.c
+++ util-linux-2.25/sys-utils/mount.c
@@ -403,6 +403,15 @@ try_readonly:
 		case -EBUSY:
 			warnx(_("%s is already mounted"), src);
 			return MOUNT_EX_USAGE;
+		/* -EROFS before syscall can happen only for loop mount */
+		case -EROFS:
+			warnx(_("%s is used as read only loop, mounting read-only"), src);
+			mnt_context_reset_status(cxt);
+			mnt_context_set_mflags(cxt, mflags | MS_RDONLY);
+			rc = mnt_context_mount(cxt);
+			if (!rc)
+				rc = mnt_context_finalize_mount(cxt);
+			goto try_readonly;
 		case -MNT_ERR_NOFSTAB:
 			if (mnt_context_is_swapmatch(cxt)) {
 				warnx(_("can't find %s in %s"),

Places

File util-linux-mount-reuse-loop-3.patch of Package util-linux-systemd.3352

Places