diff options
Diffstat (limited to 'fs/nfs/callback.h')
-rw-r--r-- | fs/nfs/callback.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h index 84326e9fb47a..ff8195bd75ea 100644 --- a/fs/nfs/callback.h +++ b/fs/nfs/callback.h | |||
@@ -61,7 +61,6 @@ struct cb_compound_hdr_res { | |||
61 | }; | 61 | }; |
62 | 62 | ||
63 | struct cb_getattrargs { | 63 | struct cb_getattrargs { |
64 | struct sockaddr *addr; | ||
65 | struct nfs_fh fh; | 64 | struct nfs_fh fh; |
66 | uint32_t bitmap[2]; | 65 | uint32_t bitmap[2]; |
67 | }; | 66 | }; |
@@ -76,7 +75,6 @@ struct cb_getattrres { | |||
76 | }; | 75 | }; |
77 | 76 | ||
78 | struct cb_recallargs { | 77 | struct cb_recallargs { |
79 | struct sockaddr *addr; | ||
80 | struct nfs_fh fh; | 78 | struct nfs_fh fh; |
81 | nfs4_stateid stateid; | 79 | nfs4_stateid stateid; |
82 | uint32_t truncate; | 80 | uint32_t truncate; |
@@ -119,9 +117,6 @@ extern __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, | |||
119 | struct cb_sequenceres *res, | 117 | struct cb_sequenceres *res, |
120 | struct cb_process_state *cps); | 118 | struct cb_process_state *cps); |
121 | 119 | ||
122 | extern int nfs41_validate_delegation_stateid(struct nfs_delegation *delegation, | ||
123 | const nfs4_stateid *stateid); | ||
124 | |||
125 | #define RCA4_TYPE_MASK_RDATA_DLG 0 | 120 | #define RCA4_TYPE_MASK_RDATA_DLG 0 |
126 | #define RCA4_TYPE_MASK_WDATA_DLG 1 | 121 | #define RCA4_TYPE_MASK_WDATA_DLG 1 |
127 | #define RCA4_TYPE_MASK_DIR_DLG 2 | 122 | #define RCA4_TYPE_MASK_DIR_DLG 2 |
@@ -134,7 +129,6 @@ extern int nfs41_validate_delegation_stateid(struct nfs_delegation *delegation, | |||
134 | #define RCA4_TYPE_MASK_ALL 0xf31f | 129 | #define RCA4_TYPE_MASK_ALL 0xf31f |
135 | 130 | ||
136 | struct cb_recallanyargs { | 131 | struct cb_recallanyargs { |
137 | struct sockaddr *craa_addr; | ||
138 | uint32_t craa_objs_to_keep; | 132 | uint32_t craa_objs_to_keep; |
139 | uint32_t craa_type_mask; | 133 | uint32_t craa_type_mask; |
140 | }; | 134 | }; |
@@ -144,7 +138,6 @@ extern __be32 nfs4_callback_recallany(struct cb_recallanyargs *args, | |||
144 | struct cb_process_state *cps); | 138 | struct cb_process_state *cps); |
145 | 139 | ||
146 | struct cb_recallslotargs { | 140 | struct cb_recallslotargs { |
147 | struct sockaddr *crsa_addr; | ||
148 | uint32_t crsa_target_highest_slotid; | 141 | uint32_t crsa_target_highest_slotid; |
149 | }; | 142 | }; |
150 | extern __be32 nfs4_callback_recallslot(struct cb_recallslotargs *args, | 143 | extern __be32 nfs4_callback_recallslot(struct cb_recallslotargs *args, |
@@ -152,7 +145,6 @@ extern __be32 nfs4_callback_recallslot(struct cb_recallslotargs *args, | |||
152 | struct cb_process_state *cps); | 145 | struct cb_process_state *cps); |
153 | 146 | ||
154 | struct cb_layoutrecallargs { | 147 | struct cb_layoutrecallargs { |
155 | struct sockaddr *cbl_addr; | ||
156 | uint32_t cbl_recall_type; | 148 | uint32_t cbl_recall_type; |
157 | uint32_t cbl_layout_type; | 149 | uint32_t cbl_layout_type; |
158 | uint32_t cbl_layoutchanged; | 150 | uint32_t cbl_layoutchanged; |
@@ -196,9 +188,6 @@ extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy, | |||
196 | #if IS_ENABLED(CONFIG_NFS_V4) | 188 | #if IS_ENABLED(CONFIG_NFS_V4) |
197 | extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt); | 189 | extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt); |
198 | extern void nfs_callback_down(int minorversion, struct net *net); | 190 | extern void nfs_callback_down(int minorversion, struct net *net); |
199 | extern int nfs4_validate_delegation_stateid(struct nfs_delegation *delegation, | ||
200 | const nfs4_stateid *stateid); | ||
201 | extern int nfs4_set_callback_sessionid(struct nfs_client *clp); | ||
202 | #endif /* CONFIG_NFS_V4 */ | 191 | #endif /* CONFIG_NFS_V4 */ |
203 | /* | 192 | /* |
204 | * nfs41: Callbacks are expected to not cause substantial latency, | 193 | * nfs41: Callbacks are expected to not cause substantial latency, |
@@ -209,6 +198,5 @@ extern int nfs4_set_callback_sessionid(struct nfs_client *clp); | |||
209 | #define NFS41_BC_MAX_CALLBACKS 1 | 198 | #define NFS41_BC_MAX_CALLBACKS 1 |
210 | 199 | ||
211 | extern unsigned int nfs_callback_set_tcpport; | 200 | extern unsigned int nfs_callback_set_tcpport; |
212 | extern unsigned short nfs_callback_tcpport; | ||
213 | 201 | ||
214 | #endif /* __LINUX_FS_NFS_CALLBACK_H */ | 202 | #endif /* __LINUX_FS_NFS_CALLBACK_H */ |