NFS: stop using NFS_MOUNT_SECFLAVOUR server flag

Since the parsed sec= flavor is now stored in nfs_server->auth_info,
we no longer need an nfs_server flag to determine if a sec= option was
used.

This flag has not been completely removed because it is still needed for
the (old but still supported) non-text parsed mount options ABI
compatability.

Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 1463c71b0862..0eb8dc5792da 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2920,7 +2920,7 @@ int nfs4_proc_get_rootfh(struct nfs_server *server, struct nfs_fh *fhandle,
                 if (status != -NFS4ERR_WRONGSEC)
                         break;
                 /* Did user force a 'sec=' mount option? */
-                if (server->flags & NFS_MOUNT_SECFLAVOUR)
+                if (server->auth_info.flavor_len > 0)
                         break;
         default:
                 status = nfs4_do_find_root_sec(server, fhandle, info);
@@ -3180,7 +3180,7 @@ static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir,
                         if (client != *clnt)
                                 goto out;
                         /* No security negotiation if the user specified 'sec=' */
-                        if (NFS_SERVER(dir)->flags & NFS_MOUNT_SECFLAVOUR)
+                        if (NFS_SERVER(dir)->auth_info.flavor_len > 0)
                                 goto out;
                         client = nfs4_create_sec_client(client, dir, name);
                         if (IS_ERR(client))