NFS: Display the chosen RPCSEC_GSS security flavour in /proc/mounts

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 4acd3ee9642792b8c27925c86b984472e335b7d6..30f939bcb72404c1b36c798bb4d2816c55a80ba6 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -318,6 +318,34 @@ static int nfs_statfs(struct super_block *sb, struct kstatfs *buf)
 
 }
 
+static const char *nfs_pseudoflavour_to_name(rpc_authflavor_t flavour)
+{
+       static struct {
+               rpc_authflavor_t flavour;
+               const char *str;
+       } sec_flavours[] = {
+               { RPC_AUTH_NULL, "null" },
+               { RPC_AUTH_UNIX, "sys" },
+               { RPC_AUTH_GSS_KRB5, "krb5" },
+               { RPC_AUTH_GSS_KRB5I, "krb5i" },
+               { RPC_AUTH_GSS_KRB5P, "krb5p" },
+               { RPC_AUTH_GSS_LKEY, "lkey" },
+               { RPC_AUTH_GSS_LKEYI, "lkeyi" },
+               { RPC_AUTH_GSS_LKEYP, "lkeyp" },
+               { RPC_AUTH_GSS_SPKM, "spkm" },
+               { RPC_AUTH_GSS_SPKMI, "spkmi" },
+               { RPC_AUTH_GSS_SPKMP, "spkmp" },
+               { -1, "unknown" }
+       };
+       int i;
+
+       for (i=0; sec_flavours[i].flavour != -1; i++) {
+               if (sec_flavours[i].flavour == flavour)
+                       break;
+       }
+       return sec_flavours[i].str;
+}
+
 /*
  * Describe the mount options in force on this server representation
  */
@@ -371,6 +399,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
        seq_printf(m, ",proto=%s", proto);
        seq_printf(m, ",timeo=%lu", 10U * nfss->retrans_timeo / HZ);
        seq_printf(m, ",retrans=%u", nfss->retrans_count);
+       seq_printf(m, ",sec=%s", nfs_pseudoflavour_to_name(nfss->client->cl_auth->au_flavor));
 }
 
 /*

diff --git a/net/sunrpc/auth_null.c b/net/sunrpc/auth_null.c
index f56767aaa9273678ca702758316acdd1587d9eef..2eccffa96ba1a016208c73de79cebc77a482f94e 100644 (file)
--- a/net/sunrpc/auth_null.c
+++ b/net/sunrpc/auth_null.c
@@ -118,6 +118,8 @@ struct rpc_auth null_auth = {
        .au_cslack      = 4,
        .au_rslack      = 2,
        .au_ops         = &authnull_ops,
+       .au_flavor      = RPC_AUTH_NULL,
+       .au_count       = ATOMIC_INIT(0),
 };
 
 static

diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index df14b6bfbf10f9a0bc8874b0a332b3b170a06199..74c7406a10549d4a747e376f5b30ae41b0764290 100644 (file)
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -225,6 +225,7 @@ struct rpc_auth             unix_auth = {
        .au_cslack      = UNX_WRITESLACK,
        .au_rslack      = 2,                    /* assume AUTH_NULL verf */
        .au_ops         = &authunix_ops,
+       .au_flavor      = RPC_AUTH_UNIX,
        .au_count       = ATOMIC_INIT(0),
        .au_credcache   = &unix_cred_cache,
 };