aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/addr.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sunrpc/addr.c')
-rw-r--r--net/sunrpc/addr.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c
index 4195233c4914..67a655ee82a9 100644
--- a/net/sunrpc/addr.c
+++ b/net/sunrpc/addr.c
@@ -19,6 +19,7 @@
19#include <net/ipv6.h> 19#include <net/ipv6.h>
20#include <linux/sunrpc/clnt.h> 20#include <linux/sunrpc/clnt.h>
21#include <linux/slab.h> 21#include <linux/slab.h>
22#include <linux/export.h>
22 23
23#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 24#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
24 25
@@ -255,12 +256,13 @@ EXPORT_SYMBOL_GPL(rpc_pton);
255/** 256/**
256 * rpc_sockaddr2uaddr - Construct a universal address string from @sap. 257 * rpc_sockaddr2uaddr - Construct a universal address string from @sap.
257 * @sap: socket address 258 * @sap: socket address
259 * @gfp_flags: allocation mode
258 * 260 *
259 * Returns a %NUL-terminated string in dynamically allocated memory; 261 * Returns a %NUL-terminated string in dynamically allocated memory;
260 * otherwise NULL is returned if an error occurred. Caller must 262 * otherwise NULL is returned if an error occurred. Caller must
261 * free the returned string. 263 * free the returned string.
262 */ 264 */
263char *rpc_sockaddr2uaddr(const struct sockaddr *sap) 265char *rpc_sockaddr2uaddr(const struct sockaddr *sap, gfp_t gfp_flags)
264{ 266{
265 char portbuf[RPCBIND_MAXUADDRPLEN]; 267 char portbuf[RPCBIND_MAXUADDRPLEN];
266 char addrbuf[RPCBIND_MAXUADDRLEN]; 268 char addrbuf[RPCBIND_MAXUADDRLEN];
@@ -288,9 +290,8 @@ char *rpc_sockaddr2uaddr(const struct sockaddr *sap)
288 if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) > sizeof(addrbuf)) 290 if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) > sizeof(addrbuf))
289 return NULL; 291 return NULL;
290 292
291 return kstrdup(addrbuf, GFP_KERNEL); 293 return kstrdup(addrbuf, gfp_flags);
292} 294}
293EXPORT_SYMBOL_GPL(rpc_sockaddr2uaddr);
294 295
295/** 296/**
296 * rpc_uaddr2sockaddr - convert a universal address to a socket address. 297 * rpc_uaddr2sockaddr - convert a universal address to a socket address.