Merge branch 'for-6.0/dax' into libnvdimm-fixes

[people/ms/linux.git] / fs / nfs / fs_context.c

diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
index 9a16897e8dc6b2036c30148f8793604e046097ec..4da701fd1424f4e6b884aef4d98f0c2c9b900e48 100644 (file)
--- a/fs/nfs/fs_context.c
+++ b/fs/nfs/fs_context.c
@@ -21,6 +21,8 @@
 #include "nfs.h"
 #include "internal.h"
 
+#include "nfstrace.h"
+
 #define NFSDBG_FACILITY                NFSDBG_MOUNT
 
 #if IS_ENABLED(CONFIG_NFS_V3)
@@ -284,7 +286,6 @@ static int nfs_verify_server_address(struct sockaddr *addr)
        }
        }
 
-       dfprintk(MOUNT, "NFS: Invalid IP address specified\n");
        return 0;
 }
 
@@ -378,7 +379,7 @@ static int nfs_parse_security_flavors(struct fs_context *fc,
        char *string = param->string, *p;
        int ret;
 
-       dfprintk(MOUNT, "NFS: parsing %s=%s option\n", param->key, param->string);
+       trace_nfs_mount_assign(param->key, string);
 
        while ((p = strsep(&string, ":")) != NULL) {
                if (!*p)
@@ -480,11 +481,11 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
        unsigned int len;
        int ret, opt;
 
-       dfprintk(MOUNT, "NFS:   parsing nfs mount option '%s'\n", param->key);
+       trace_nfs_mount_option(param);
 
        opt = fs_parse(fc, nfs_fs_parameters, param, &result);
        if (opt < 0)
-               return ctx->sloppy ? 1 : opt;
+               return (opt == -ENOPARAM && ctx->sloppy) ? 1 : opt;
 
        if (fc->security)
                ctx->has_sec_mnt_opts = 1;
@@ -683,6 +684,7 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
                        return ret;
                break;
        case Opt_vers:
+               trace_nfs_mount_assign(param->key, param->string);
                ret = nfs_parse_version_string(fc, param->string);
                if (ret < 0)
                        return ret;
@@ -694,6 +696,7 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
                break;
 
        case Opt_proto:
+               trace_nfs_mount_assign(param->key, param->string);
                protofamily = AF_INET;
                switch (lookup_constant(nfs_xprt_protocol_tokens, param->string, -1)) {
                case Opt_xprt_udp6:
@@ -729,6 +732,7 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
                break;
 
        case Opt_mountproto:
+               trace_nfs_mount_assign(param->key, param->string);
                mountfamily = AF_INET;
                switch (lookup_constant(nfs_xprt_protocol_tokens, param->string, -1)) {
                case Opt_xprt_udp6:
@@ -751,6 +755,7 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
                break;
 
        case Opt_addr:
+               trace_nfs_mount_assign(param->key, param->string);
                len = rpc_pton(fc->net_ns, param->string, param->size,
                               &ctx->nfs_server.address,
                               sizeof(ctx->nfs_server._address));
@@ -759,16 +764,19 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
                ctx->nfs_server.addrlen = len;
                break;
        case Opt_clientaddr:
+               trace_nfs_mount_assign(param->key, param->string);
                kfree(ctx->client_address);
                ctx->client_address = param->string;
                param->string = NULL;
                break;
        case Opt_mounthost:
+               trace_nfs_mount_assign(param->key, param->string);
                kfree(ctx->mount_server.hostname);
                ctx->mount_server.hostname = param->string;
                param->string = NULL;
                break;
        case Opt_mountaddr:
+               trace_nfs_mount_assign(param->key, param->string);
                len = rpc_pton(fc->net_ns, param->string, param->size,
                               &ctx->mount_server.address,
                               sizeof(ctx->mount_server._address));
@@ -846,7 +854,6 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
                 */
        case Opt_sloppy:
                ctx->sloppy = true;
-               dfprintk(MOUNT, "NFS:   relaxing parsing rules\n");
                break;
        }
 
@@ -879,10 +886,8 @@ static int nfs_parse_source(struct fs_context *fc,
        size_t len;
        const char *end;
 
-       if (unlikely(!dev_name || !*dev_name)) {
-               dfprintk(MOUNT, "NFS: device name not specified\n");
+       if (unlikely(!dev_name || !*dev_name))
                return -EINVAL;
-       }
 
        /* Is the host name protected with square brakcets? */
        if (*dev_name == '[') {
@@ -922,7 +927,7 @@ static int nfs_parse_source(struct fs_context *fc,
        if (!ctx->nfs_server.export_path)
                goto out_nomem;
 
-       dfprintk(MOUNT, "NFS: MNTPATH: '%s'\n", ctx->nfs_server.export_path);
+       trace_nfs_mount_path(ctx->nfs_server.export_path);
        return 0;
 
 out_bad_devname:
@@ -1116,7 +1121,6 @@ out_no_sec:
        return nfs_invalf(fc, "NFS: nfs_mount_data version supports only AUTH_SYS");
 
 out_nomem:
-       dfprintk(MOUNT, "NFS: not enough memory to handle mount options");
        return -ENOMEM;
 
 out_no_address:
@@ -1248,7 +1252,7 @@ static int nfs4_parse_monolithic(struct fs_context *fc,
        if (IS_ERR(c))
                return PTR_ERR(c);
        ctx->nfs_server.export_path = c;
-       dfprintk(MOUNT, "NFS: MNTPATH: '%s'\n", c);
+       trace_nfs_mount_path(c);
 
        c = strndup_user(data->client_addr.data, 16);
        if (IS_ERR(c))