on 2nd try mount.cifs must also uppercase "orig_dev" - recent kernels now ignore "unc=..." mount option

userland mount helper mount.cifs.

Also uppercase the now used (kernel) "orig_dev" parameter, to get the mount retry working again.

Cheers, Günter

From: Guenter Kukkukk <[email protected]>
Date: Tue, 1 Jul 2014 17:43:55 +0200
Subject: [PATCH] on 2nd try mount.cifs must also uppercase "orig_dev" - recent
kernels now ignore "unc=..." mount option

mount.cifs.c, when getting errno=ENXIO, retries the mount with uppercased hostname, sharename and prefixpath in the "unc=..." mount option, which is ignored now in the kernel. Used e.g. during OS/2 mounts, which fail now.

Also uppercase the now used "orig_dev" parameter.

---
 mount.cifs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index 497665d..3535096 100644
@@ -2097,7 +2097,8 @@ mount_retry:
 			if (!already_uppercased &&
 			    uppercase_string(parsed_info->host) &&
 			    uppercase_string(parsed_info->share) &&
-			    uppercase_string(parsed_info->prefix)) {
+			    uppercase_string(parsed_info->prefix) &&
+			    uppercase_string(orig_dev)) {
 				fprintf(stderr,
 					"Retrying with upper case share name\n");
 				already_uppercased = 1;

1.8.4.5

Thanks Günter. Patch looks correct to me. I'll merge it within the next few days unless someone objects.

Cheers!

Jeff Layton <[email protected]>

Patch merged into master.

Thanks!

Jeff Layton <[email protected]>