diff options
Diffstat (limited to 'include/linux/lockd/lockd.h')
-rw-r--r-- | include/linux/lockd/lockd.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index d7d313fb9cd4..4fd95dbeb52f 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <net/ipv6.h> | 17 | #include <net/ipv6.h> |
18 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
19 | #include <linux/kref.h> | 19 | #include <linux/kref.h> |
20 | #include <linux/refcount.h> | ||
20 | #include <linux/utsname.h> | 21 | #include <linux/utsname.h> |
21 | #include <linux/lockd/bind.h> | 22 | #include <linux/lockd/bind.h> |
22 | #include <linux/lockd/xdr.h> | 23 | #include <linux/lockd/xdr.h> |
@@ -58,7 +59,7 @@ struct nlm_host { | |||
58 | u32 h_state; /* pseudo-state counter */ | 59 | u32 h_state; /* pseudo-state counter */ |
59 | u32 h_nsmstate; /* true remote NSM state */ | 60 | u32 h_nsmstate; /* true remote NSM state */ |
60 | u32 h_pidcount; /* Pseudopids */ | 61 | u32 h_pidcount; /* Pseudopids */ |
61 | atomic_t h_count; /* reference count */ | 62 | refcount_t h_count; /* reference count */ |
62 | struct mutex h_mutex; /* mutex for pmap binding */ | 63 | struct mutex h_mutex; /* mutex for pmap binding */ |
63 | unsigned long h_nextrebind; /* next portmap call */ | 64 | unsigned long h_nextrebind; /* next portmap call */ |
64 | unsigned long h_expires; /* eligible for GC */ | 65 | unsigned long h_expires; /* eligible for GC */ |
@@ -83,7 +84,7 @@ struct nlm_host { | |||
83 | 84 | ||
84 | struct nsm_handle { | 85 | struct nsm_handle { |
85 | struct list_head sm_link; | 86 | struct list_head sm_link; |
86 | atomic_t sm_count; | 87 | refcount_t sm_count; |
87 | char *sm_mon_name; | 88 | char *sm_mon_name; |
88 | char *sm_name; | 89 | char *sm_name; |
89 | struct sockaddr_storage sm_addr; | 90 | struct sockaddr_storage sm_addr; |
@@ -122,7 +123,7 @@ static inline struct sockaddr *nlm_srcaddr(const struct nlm_host *host) | |||
122 | */ | 123 | */ |
123 | struct nlm_lockowner { | 124 | struct nlm_lockowner { |
124 | struct list_head list; | 125 | struct list_head list; |
125 | atomic_t count; | 126 | refcount_t count; |
126 | 127 | ||
127 | struct nlm_host *host; | 128 | struct nlm_host *host; |
128 | fl_owner_t owner; | 129 | fl_owner_t owner; |
@@ -136,7 +137,7 @@ struct nlm_wait; | |||
136 | */ | 137 | */ |
137 | #define NLMCLNT_OHSIZE ((__NEW_UTS_LEN) + 10u) | 138 | #define NLMCLNT_OHSIZE ((__NEW_UTS_LEN) + 10u) |
138 | struct nlm_rqst { | 139 | struct nlm_rqst { |
139 | atomic_t a_count; | 140 | refcount_t a_count; |
140 | unsigned int a_flags; /* initial RPC task flags */ | 141 | unsigned int a_flags; /* initial RPC task flags */ |
141 | struct nlm_host * a_host; /* host handle */ | 142 | struct nlm_host * a_host; /* host handle */ |
142 | struct nlm_args a_args; /* arguments */ | 143 | struct nlm_args a_args; /* arguments */ |