Skip to contentSkip to conversation

accept all supported values for dir_mode

PATCH Jeff Layton 2 participants 3 messages Jun 6, 2010 – Jun 7, 2010 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 12 lines · On Thu, 3 Jun 2010 02:39:19 -0400 Scott Lovenberg <[email protected]>…

The option parsing function now accepts all values for 'dir_mode' that are supported by the kernel side code.

---
 mount.cifs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
mount.cifs.c +0 -0
index 65754c0..21ce532 100644

mount.cifs.c static int parse_opt_token(const char *token) · line 815

Quoted 5 lines
mount.cifs.c +1 -1
@@ -812,7 +812,7 @@ static int parse_opt_token(const char *token)
 		return OPT_FILE_MODE;
 	if (strncmp(token, "dmask", 5) == 0)
 		return OPT_DMASK;
-	if (strncmp(token, "dir_mode", 8) == 0)
+	if (strncmp(token, "dir_mode", 4) == 0 || strncmp(token, "dirm", 4) == 0)
				      ^^^^

Sigh. But I can confirm that this is similarly broken in the kernel so we have little choice but to live with it here.

mount.cifs.c static int parse_opt_token(const char *token) · line 818

Quoted 3 lines
mount.cifs.c +0 -0
 		return OPT_DIR_MODE;
 	if (strncmp(token, "nosuid", 6) == 0)
 		return OPT_NO_SUID;

Committed...

Signature · 1 line
Jeff Layton <[email protected]>
#2 lore raw
Quoted 9 lines

Review

Quoted 3 lines
(quoted diff) +1 -1
-     if (strncmp(token, "dir_mode", 8) == 0)
+     if (strncmp(token, "dir_mode", 4) == 0 || strncmp(token, "dirm", 4)

== 0)

                                      ^^^^

Sigh. But I can confirm that this is similarly broken in the kernel so we have little choice but to live with it here.

That's exactly how I felt about this fix. Do you have any feelings on

fixing this on both sides to accept only the full strings? It might cause regressions for people, so the kernel patch will probably be pulled by Redhat, Suse and Debian (and anyone else backporting kernel patches for long term releases) maintainers.
It seems like the right thing to do, but if it's just going to cause extra work and be yanked either way... well, that's one step forward, two backwards.

Signature · 2 lines
Peace and Blessings,
-Scott.

_______________________________________________
linux-cifs-client mailing list
[email protected]
https://lists.samba.org/mailman/listinfo/linux-cifs-client

#3 lore raw
Quoted 8 lines · On Mon, 7 Jun 2010 00:20:14 -0400 Scott Lovenberg <[email protected]>…
Quoted 8 lines

Review

Quoted 3 lines
(quoted diff) +1 -1
-     if (strncmp(token, "dir_mode", 8) == 0)
+     if (strncmp(token, "dir_mode", 4) == 0 || strncmp(token, "dirm", 4)

== 0)

                                      ^^^^

Sigh. But I can confirm that this is similarly broken in the kernel so we have little choice but to live with it here.

Quoted 10 lines
Quoted 1 line

That's exactly how I felt about this fix. Do you have any feelings on

fixing this on both sides to accept only the full strings? It might cause regressions for people, so the kernel patch will probably be pulled by Redhat, Suse and Debian (and anyone else backporting kernel patches for long term releases) maintainers.
It seems like the right thing to do, but if it's just going to cause extra work and be yanked either way... well, that's one step forward, two backwards.

I think we're stuck living with it like this. The maintenance burden on this sort of thing is fairly low so it's not really a big deal. This is a good reason why we have to consider user-visible interfaces very carefully however.

Signature · 1 line
Jeff Layton <[email protected]>