Skip to content

Commit af76fc6

Browse files
olgakorn1J. Bruce Fields
authored andcommitted
NFSD fill-in netloc4 structure
nfs.4 defines nfs42_netaddr structure that represents netloc4. Populate needed fields from the sockaddr structure. This will be used by flexfiles and 4.2 inter copy Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
1 parent e42617b commit af76fc6

File tree

1 file changed

+32
-0
lines changed

1 file changed

+32
-0
lines changed

fs/nfsd/nfsd.h

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <linux/sunrpc/svc.h>
2020
#include <linux/sunrpc/svc_xprt.h>
2121
#include <linux/sunrpc/msg_prot.h>
22+
#include <linux/sunrpc/addr.h>
2223

2324
#include <uapi/linux/nfsd/debug.h>
2425

@@ -387,6 +388,37 @@ void nfsd_lockd_shutdown(void);
387388

388389
extern const u32 nfsd_suppattrs[3][3];
389390

391+
static inline u32 nfsd4_set_netaddr(struct sockaddr *addr,
392+
struct nfs42_netaddr *netaddr)
393+
{
394+
struct sockaddr_in *sin = (struct sockaddr_in *)addr;
395+
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)addr;
396+
unsigned int port;
397+
size_t ret_addr, ret_port;
398+
399+
switch (addr->sa_family) {
400+
case AF_INET:
401+
port = ntohs(sin->sin_port);
402+
sprintf(netaddr->netid, "tcp");
403+
netaddr->netid_len = 3;
404+
break;
405+
case AF_INET6:
406+
port = ntohs(sin6->sin6_port);
407+
sprintf(netaddr->netid, "tcp6");
408+
netaddr->netid_len = 4;
409+
break;
410+
default:
411+
return nfserr_inval;
412+
}
413+
ret_addr = rpc_ntop(addr, netaddr->addr, sizeof(netaddr->addr));
414+
ret_port = snprintf(netaddr->addr + ret_addr,
415+
RPCBIND_MAXUADDRLEN + 1 - ret_addr,
416+
".%u.%u", port >> 8, port & 0xff);
417+
WARN_ON(ret_port >= RPCBIND_MAXUADDRLEN + 1 - ret_addr);
418+
netaddr->addr_len = ret_addr + ret_port;
419+
return 0;
420+
}
421+
390422
static inline bool bmval_is_subset(const u32 *bm1, const u32 *bm2)
391423
{
392424
return !((bm1[0] & ~bm2[0]) ||

0 commit comments

Comments
 (0)