These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / sunrpc / auth_gss / auth_gss.c

diff --git a/kernel/net/sunrpc/auth_gss/auth_gss.c b/kernel/net/sunrpc/auth_gss/auth_gss.c
index dace13d..799e65b 100644 (file)
--- a/kernel/net/sunrpc/auth_gss/auth_gss.c
+++ b/kernel/net/sunrpc/auth_gss/auth_gss.c
@@ -1411,17 +1411,16 @@ gss_key_timeout(struct rpc_cred *rc)
 {
        struct gss_cred *gss_cred = container_of(rc, struct gss_cred, gc_base);
        struct gss_cl_ctx *ctx;
-       unsigned long now = jiffies;
-       unsigned long expire;
+       unsigned long timeout = jiffies + (gss_key_expire_timeo * HZ);
+       int ret = 0;
 
        rcu_read_lock();
        ctx = rcu_dereference(gss_cred->gc_ctx);
-       if (ctx)
-               expire = ctx->gc_expiry - (gss_key_expire_timeo * HZ);
+       if (!ctx || time_after(timeout, ctx->gc_expiry))
+               ret = -EACCES;
        rcu_read_unlock();
-       if (!ctx || time_after(now, expire))
-               return -EACCES;
-       return 0;
+
+       return ret;
 }
 
 static int