Skip to contentSkip to conversation

mount.cifs: ignore comment mount option

PATCH In review Martin Schwenke 3 participants 3 messages Sep 25, 2020 – Nov 9, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mount.cifs: ignore comment mount option

mount.cifs currently complains about the "comment" option:

CIFS: Unknown mount option "comment=foo"

mount(8) on Linux says:

The command mount does not pass the mount options unbindable, runbindable, private, rprivate, slave, rslave, shared, rshared, auto, noauto, comment, x-*, loop, offset and sizelimit to the mount.<suffix> helpers.

So if mount.cifs decides to re-read /etc/fstab it should ignore the comment option.

A lot of online posts say to use comment=x-gvfs-show as an option to have a Linux file manager display a mountpoint for a user mountable filesystem. While the "comment=" part is superfluous when combined with an x-* option, the problem is still difficult to debug.

Patch attached...

peace & happiness,
martin

From 97a071f7f1bf5274c027ee92fc0f6ca629ecdd65 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <[email protected]>
Date: Fri, 25 Sep 2020 11:16:39 +1000
Subject: [PATCH] mount.cifs: ignore comment mount option

mount.cifs currently complains about the "comment" option:

CIFS: Unknown mount option "comment=foo"

mount(8) on Linux says:

The command mount does not pass the mount options unbindable, runbindable, private, rprivate, slave, rslave, shared, rshared, auto, noauto, comment, x-*, loop, offset and sizelimit to the mount.<suffix> helpers.

So if mount.cifs decides to re-read /etc/fstab it should ignore the comment option.

A lot of online posts say to use comment=x-gvfs-show as an option to have a Linux file manager display a mountpoint for a user mountable filesystem. While the "comment=" part is superfluous when combined with an x-* option, the problem is still difficult to debug.

---
 mount.cifs.c | 2 ++
 1 file changed, 2 insertions(+)
mount.cifs.c +2 -0
index 4feb397..5d43c00 100644
@@ -777,6 +777,8 @@ static int parse_opt_token(const char *token)
 		return OPT_BKUPGID;
 	if (strcmp(token, "nofail") == 0)
 		return OPT_NOFAIL;
+	if (strcmp(token, "comment") == 0)
+		return OPT_IGNORE;
 	if (strncmp(token, "x-", 2) == 0)
 		return OPT_IGNORE;
 	if (strncmp(token, "snapshot", 8) == 0)
Signature · 1 line
2.28.0
Reviewed-by on v1 1/1
#1 lore raw

Cheers,

Signature · 4 lines
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97  8C99 03C8 A49B 521B D5D3
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)
#2 lore raw

Merged. Thanks!
--
Best regards,
Pavel Shilovsky

пт, 25 сент. 2020 г. в 02:30, Aurélien Aptel <[email protected]>:

Quoted 10 lines

Cheers,
--
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)