aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/lockd
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-12-04 14:20:08 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-01-06 11:53:49 -0500
commitbc995801a09d1fead0bec1356bfd836911c8eed7 (patch)
treeb7a2faad59bfa92db4057c23fcf7d31b70d20611 /include/linux/lockd
parent6999fb4016b2604c2f8a65586bba4a62a4b24ce7 (diff)
NLM: Support IPv6 scope IDs in nlm_display_address()
Scope ID support is needed since the kernel's NSM implementation is about to use these displayed addresses as a mon_name in some cases. When nsm_use_hostnames is zero, without scope ID support NSM will fail to handle peers that contact us via a link-local address. Link-local addresses do not work without an interface ID, which is stored in the sockaddr's sin6_scope_id field. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'include/linux/lockd')
-rw-r--r--include/linux/lockd/lockd.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index dae22cb4c38d..80a0a2cff2b8 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -68,6 +68,14 @@ struct nlm_host {
68 char *h_addrbuf; /* address eyecatcher */ 68 char *h_addrbuf; /* address eyecatcher */
69}; 69};
70 70
71/*
72 * The largest string sm_addrbuf should hold is a full-size IPv6 address
73 * (no "::" anywhere) with a scope ID. The buffer size is computed to
74 * hold eight groups of colon-separated four-hex-digit numbers, a
75 * percent sign, a scope id (at most 32 bits, in decimal), and NUL.
76 */
77#define NSM_ADDRBUF ((8 * 4 + 7) + (1 + 10) + 1)
78
71struct nsm_handle { 79struct nsm_handle {
72 struct list_head sm_link; 80 struct list_head sm_link;
73 atomic_t sm_count; 81 atomic_t sm_count;
@@ -76,7 +84,7 @@ struct nsm_handle {
76 size_t sm_addrlen; 84 size_t sm_addrlen;
77 unsigned int sm_monitored : 1, 85 unsigned int sm_monitored : 1,
78 sm_sticky : 1; /* don't unmonitor */ 86 sm_sticky : 1; /* don't unmonitor */
79 char sm_addrbuf[48]; /* address eyecatcher */ 87 char sm_addrbuf[NSM_ADDRBUF];
80}; 88};
81 89
82/* 90/*