SUNRPC: Fix rpc_sockaddr2uaddr

rpc_sockaddr2uaddr is only used by net/sunrpc/rpcb_clnt.c, where
it is used in a non-blockable context in at least one case.

Add non-blocking capability by adding a gfp_t argument

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index e45d2fbbe5a8..f588b852d41c 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -410,7 +410,7 @@ static int rpcb_register_inet4(const struct sockaddr *sap,
         unsigned short port = ntohs(sin->sin_port);
         int result;
 
-        map->r_addr = rpc_sockaddr2uaddr(sap);
+        map->r_addr = rpc_sockaddr2uaddr(sap, GFP_KERNEL);
 
         dprintk("RPC:       %sregistering [%u, %u, %s, '%s'] with "
                 "local rpcbind\n", (port ? "" : "un"),
@@ -437,7 +437,7 @@ static int rpcb_register_inet6(const struct sockaddr *sap,
         unsigned short port = ntohs(sin6->sin6_port);
         int result;
 
-        map->r_addr = rpc_sockaddr2uaddr(sap);
+        map->r_addr = rpc_sockaddr2uaddr(sap, GFP_KERNEL);
 
         dprintk("RPC:       %sregistering [%u, %u, %s, '%s'] with "
                 "local rpcbind\n", (port ? "" : "un"),
@@ -686,7 +686,7 @@ void rpcb_getport_async(struct rpc_task *task)
         case RPCBVERS_4:
         case RPCBVERS_3:
                 map->r_netid = rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID);
-                map->r_addr = rpc_sockaddr2uaddr(sap);
+                map->r_addr = rpc_sockaddr2uaddr(sap, GFP_ATOMIC);
                 map->r_owner = "";
                 break;
         case RPCBVERS_2: