Merge tag 'ovl-update-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

[linux-2.6-microblaze.git] / fs / nfs / fs_context.c

diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
index e113fcb..ccc88be 100644 (file)
--- a/fs/nfs/fs_context.c
+++ b/fs/nfs/fs_context.c
@@ -190,6 +190,7 @@ static const struct constant_table nfs_vers_tokens[] = {
        { "4.0",        Opt_vers_4_0 },
        { "4.1",        Opt_vers_4_1 },
        { "4.2",        Opt_vers_4_2 },
+       {}
 };
 
 enum {
@@ -202,13 +203,14 @@ enum {
        nr__Opt_xprt
 };
 
-static const struct constant_table nfs_xprt_protocol_tokens[nr__Opt_xprt] = {
+static const struct constant_table nfs_xprt_protocol_tokens[] = {
        { "rdma",       Opt_xprt_rdma },
        { "rdma6",      Opt_xprt_rdma6 },
        { "tcp",        Opt_xprt_tcp },
        { "tcp6",       Opt_xprt_tcp6 },
        { "udp",        Opt_xprt_udp },
        { "udp6",       Opt_xprt_udp6 },
+       {}
 };
 
 enum {
@@ -239,6 +241,7 @@ static const struct constant_table nfs_secflavor_tokens[] = {
        { "spkm3i",     Opt_sec_spkmi },
        { "spkm3p",     Opt_sec_spkmp },
        { "sys",        Opt_sec_sys },
+       {}
 };
 
 /*
@@ -1135,7 +1138,7 @@ out_no_address:
        return nfs_invalf(fc, "NFS4: mount program didn't pass remote address");
 
 out_invalid_transport_udp:
-       return nfs_invalf(fc, "NFSv4: Unsupported transport protocol udp");
+       return nfs_invalf(fc, "NFS: Unsupported transport protocol udp");
 }
 #endif
 
@@ -1257,7 +1260,7 @@ out_v4_not_compiled:
        nfs_errorf(fc, "NFS: NFSv4 is not compiled into kernel");
        return -EPROTONOSUPPORT;
 out_invalid_transport_udp:
-       return nfs_invalf(fc, "NFSv4: Unsupported transport protocol udp");
+       return nfs_invalf(fc, "NFS: Unsupported transport protocol udp");
 out_no_address:
        return nfs_invalf(fc, "NFS: mount program didn't pass remote address");
 out_mountproto_mismatch: