2 files changed, 2 insertions, 11 deletions

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 73d4ecda1e36..dbb3e1f30c68 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -372,10 +372,7 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp,
         __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
         __set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags);
 
-        error = -EINVAL;
-        if (gssd_running(clp->cl_net))
-                error = nfs_create_rpc_client(clp, timeparms,
-                                              RPC_AUTH_GSS_KRB5I);
+        error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I);
         if (error == -EINVAL)
                 error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX);
         if (error < 0)
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 0a2aee060f9f..6c0513a7f992 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -532,13 +532,7 @@ gss_setup_upcall(struct gss_auth *gss_auth, struct rpc_cred *cred)
 
 static void warn_gssd(void)
 {
-        static unsigned long ratelimit;
-        unsigned long now = jiffies;
-
-        if (time_after(now, ratelimit)) {
-                pr_warn("RPC: AUTH_GSS upcall failed. Please check user daemon is running.\n");
-                ratelimit = now + 15*HZ;
-        }
+        dprintk("AUTH_GSS upcall failed. Please check user daemon is running.\n");
 }
 
 static inline int