SUNRPC: TCP clear XPRT_CLOSE_WAIT when the socket is closed for writes

[~andy/linux] / net / sunrpc / auth_null.c

diff --git a/net/sunrpc/auth_null.c b/net/sunrpc/auth_null.c
index fe9b6aaf91ebfe345ee1db0e333a4cad87c8e1cb..537d0e8589ddb598c9137eb97ccea1a870af04a6 100644 (file)
--- a/net/sunrpc/auth_null.c
+++ b/net/sunrpc/auth_null.c
@@ -76,7 +76,7 @@ nul_marshal(struct rpc_task *task, __be32 *p)
 static int
 nul_refresh(struct rpc_task *task)
 {
-       task->tk_msg.rpc_cred->cr_flags |= RPCAUTH_CRED_UPTODATE;
+       set_bit(RPCAUTH_CRED_UPTODATE, &task->tk_msg.rpc_cred->cr_flags);
        return 0;
 }
 
@@ -133,10 +133,11 @@ const struct rpc_credops null_credops = {
 
 static
 struct rpc_cred null_cred = {
+       .cr_lru         = LIST_HEAD_INIT(null_cred.cr_lru),
        .cr_auth        = &null_auth,
        .cr_ops         = &null_credops,
        .cr_count       = ATOMIC_INIT(1),
-       .cr_flags       = RPCAUTH_CRED_UPTODATE,
+       .cr_flags       = 1UL << RPCAUTH_CRED_UPTODATE,
 #ifdef RPC_DEBUG
        .cr_magic       = RPCAUTH_CRED_MAGIC,
 #endif