---

yaml
---
r: 97105
b: refs/heads/master
c: fc63a05
h: refs/heads/master
i:
  97103: ff56426
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d71a4dd72e67210ae0767ccae69c79f1c933ff64
+refs/heads/master: fc63a050861a53ba99a6222229cda555796d669e

trunk/fs/nfsd/nfs4callback.c

@@ -419,9 +419,9 @@ static int do_probe_callback(void *data)
 out_release_client:
 	rpc_shutdown_client(client);
 out_err:
+	put_nfs4_client(clp);
 	dprintk("NFSD: warning: no callback path to client %.*s\n",
 		(int)clp->cl_name.len, clp->cl_name.data);
-	put_nfs4_client(clp);
 	return status;
 }
 

trunk/net/sunrpc/svc_xprt.c

@@ -296,8 +296,6 @@ void svc_xprt_enqueue(struct svc_xprt *xprt)
 	if (!(xprt->xpt_flags &
 	      ((1<<XPT_CONN)|(1<<XPT_DATA)|(1<<XPT_CLOSE)|(1<<XPT_DEFERRED))))
 		return;
-	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
-		return;
 
 	cpu = get_cpu();
 	pool = svc_pool_for_cpu(xprt->xpt_server, cpu);

trunk/net/sunrpc/svcauth_unix.c

@@ -278,15 +278,15 @@ static int ip_map_show(struct seq_file *m,
 		dom = im->m_client->h.name;
 
 	if (ipv6_addr_v4mapped(&addr)) {
-		seq_printf(m, "%s " NIPQUAD_FMT " %s\n",
+		seq_printf(m, "%s" NIPQUAD_FMT "%s\n",
 			im->m_class,
 			ntohl(addr.s6_addr32[3]) >> 24 & 0xff,
 			ntohl(addr.s6_addr32[3]) >> 16 & 0xff,
 			ntohl(addr.s6_addr32[3]) >>  8 & 0xff,
 			ntohl(addr.s6_addr32[3]) >>  0 & 0xff,
 			dom);
 	} else {
-		seq_printf(m, "%s " NIP6_FMT " %s\n",
+		seq_printf(m, "%s" NIP6_FMT "%s\n",
 			im->m_class, NIP6(addr), dom);
 	}
 	return 0;