Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[PATCH 3/3] ocfs2/net: Silence build warnings
This patch silences the build warnings concerning o2net_init_nst()
and friends when building without CONFIG_DEBUG_FS enabled.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
authored by Sunil Mushran and committed by Mark Fasheh 0f475b2a 959040c3
+9
-19
fs/ocfs2/cluster/tcp.c
+9
-19
fs/ocfs2/cluster/tcp.c
···
142
static void o2net_sc_postpone_idle(struct o2net_sock_container *sc);
143
static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc);
144
145
-
static void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype,
146
-
u32 msgkey, struct task_struct *task, u8 node)
147
-
{
148
#ifdef CONFIG_DEBUG_FS
149
INIT_LIST_HEAD(&nst->st_net_debug_item);
150
nst->st_task = task;
151
nst->st_msg_type = msgtype;
152
nst->st_msg_key = msgkey;
153
nst->st_node = node;
154
-
#endif
155
}
156
157
-
static void o2net_set_nst_sock_time(struct o2net_send_tracking *nst)
158
{
159
-
#ifdef CONFIG_DEBUG_FS
160
do_gettimeofday(&nst->st_sock_time);
161
-
#endif
162
}
163
164
-
static void o2net_set_nst_send_time(struct o2net_send_tracking *nst)
165
{
166
-
#ifdef CONFIG_DEBUG_FS
167
do_gettimeofday(&nst->st_send_time);
168
-
#endif
169
}
170
171
-
static void o2net_set_nst_status_time(struct o2net_send_tracking *nst)
172
{
173
-
#ifdef CONFIG_DEBUG_FS
174
do_gettimeofday(&nst->st_status_time);
175
-
#endif
176
}
177
178
-
static void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,
179
struct o2net_sock_container *sc)
180
{
181
-
#ifdef CONFIG_DEBUG_FS
182
nst->st_sc = sc;
183
-
#endif
184
}
185
186
-
static void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id)
187
{
188
-
#ifdef CONFIG_DEBUG_FS
189
nst->st_id = msg_id;
190
-
#endif
191
}
192
193
static inline int o2net_reconnect_delay(void)
194
{
···
142
static void o2net_sc_postpone_idle(struct o2net_sock_container *sc);
143
static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc);
144
145
#ifdef CONFIG_DEBUG_FS
146
+
void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype,
147
+
u32 msgkey, struct task_struct *task, u8 node)
148
+
{
149
INIT_LIST_HEAD(&nst->st_net_debug_item);
150
nst->st_task = task;
151
nst->st_msg_type = msgtype;
152
nst->st_msg_key = msgkey;
153
nst->st_node = node;
154
}
155
156
+
void o2net_set_nst_sock_time(struct o2net_send_tracking *nst)
157
{
158
do_gettimeofday(&nst->st_sock_time);
159
}
160
161
+
void o2net_set_nst_send_time(struct o2net_send_tracking *nst)
162
{
163
do_gettimeofday(&nst->st_send_time);
164
}
165
166
+
void o2net_set_nst_status_time(struct o2net_send_tracking *nst)
167
{
168
do_gettimeofday(&nst->st_status_time);
169
}
170
171
+
void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,
172
struct o2net_sock_container *sc)
173
{
174
nst->st_sc = sc;
175
}
176
177
+
void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id)
178
{
179
nst->st_id = msg_id;
180
}
181
+
#endif /* CONFIG_DEBUG_FS */
182
183
static inline int o2net_reconnect_delay(void)
184
{
+32
fs/ocfs2/cluster/tcp_internal.h
+32
fs/ocfs2/cluster/tcp_internal.h
···
224
struct timeval st_send_time;
225
struct timeval st_status_time;
226
};
227
+
228
+
void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype,
229
+
u32 msgkey, struct task_struct *task, u8 node);
230
+
void o2net_set_nst_sock_time(struct o2net_send_tracking *nst);
231
+
void o2net_set_nst_send_time(struct o2net_send_tracking *nst);
232
+
void o2net_set_nst_status_time(struct o2net_send_tracking *nst);
233
+
void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,
234
+
struct o2net_sock_container *sc);
235
+
void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id);
236
+
237
#else
238
struct o2net_send_tracking {
239
u32 dummy;
240
};
241
+
242
+
static inline void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype,
243
+
u32 msgkey, struct task_struct *task, u8 node)
244
+
{
245
+
}
246
+
static inline void o2net_set_nst_sock_time(struct o2net_send_tracking *nst)
247
+
{
248
+
}
249
+
static inline void o2net_set_nst_send_time(struct o2net_send_tracking *nst)
250
+
{
251
+
}
252
+
static inline void o2net_set_nst_status_time(struct o2net_send_tracking *nst)
253
+
{
254
+
}
255
+
static inline void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,
256
+
struct o2net_sock_container *sc)
257
+
{
258
+
}
259
+
static inline void o2net_set_nst_msg_id(struct o2net_send_tracking *nst,
260
+
u32 msg_id)
261
+
{
262
+
}
263
#endif /* CONFIG_DEBUG_FS */
264
265
#endif /* O2CLUSTER_TCP_INTERNAL_H */