nfs: Return EINVAL rather than ERANGE for mount parse errors

Return EINVAL rather than ERANGE for mount parse errors as the userspace
mount command doesn't necessarily understand what to do with anything other
than EINVAL.

The old code returned -ERANGE as an intermediate error that then get
converted to -EINVAL, whereas the new code returns -ERANGE.

This was induced by passing minorversion=1 to a v4 mount where
CONFIG_NFS_V4_1 was disabled in the kernel build.

Fixes: 68f65ef40e1e ("NFS: Convert mount option parsing to use functionality from fs_parser.h")
Reported-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
index dfd95847f005acf8e3b228e5c5610f0e7587b2fb..2c6dc1b6cc921826aa515cfa6b2523269d1124cc 100644 (file)
--- a/fs/nfs/fs_context.c
+++ b/fs/nfs/fs_context.c
@@ -779,8 +779,7 @@ out_invalid_value:
 out_invalid_address:
        return nfs_invalf(fc, "NFS: Bad IP address specified");
 out_of_bounds:
-       nfs_invalf(fc, "NFS: Value for '%s' out of range", param->key);
-       return -ERANGE;
+       return nfs_invalf(fc, "NFS: Value for '%s' out of range", param->key);
 }
 
 /*