Skip to content

Commit 8f7df60

Browse files
arndbsmfrench
authored andcommitted
ksmbd: fix non-IPv6 build
The newly added procfs code fails to build when CONFIG_IPv6 is disabled: fs/smb/server/connection.c: In function 'proc_show_clients': fs/smb/server/connection.c:47:58: error: 'struct ksmbd_conn' has no member named 'inet6_addr'; did you mean 'inet_addr'? 47 | seq_printf(m, "%-20pI6c", &conn->inet6_addr); | ^~~~~~~~~~ | inet_addr make[7]: *** [scripts/Makefile.build:279: fs/smb/server/connection.o] Error 1 fs/smb/server/mgmt/user_session.c: In function 'show_proc_sessions': fs/smb/server/mgmt/user_session.c:215:65: error: 'struct ksmbd_conn' has no member named 'inet6_addr'; did you mean 'inet_addr'? 215 | seq_printf(m, " %-40pI6c", &chan->conn->inet6_addr); | ^~~~~~~~~~ | inet_addr Rearrange the condition to allow adding a simple preprocessor conditional. Fixes: b38f99c ("ksmbd: add procfs interface for runtime monitoring and statistics") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 31b9028 commit 8f7df60

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

fs/smb/server/connection.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ static int proc_show_clients(struct seq_file *m, void *v)
4141
jiffies_to_timespec64(jiffies - conn->last_active, &t);
4242
ktime_get_real_ts64(&now);
4343
t = timespec64_sub(now, t);
44-
if (conn->inet_addr)
45-
seq_printf(m, "%-20pI4", &conn->inet_addr);
46-
else
44+
#if IS_ENABLED(CONFIG_IPV6)
45+
if (!conn->inet_addr)
4746
seq_printf(m, "%-20pI6c", &conn->inet6_addr);
47+
else
48+
#endif
49+
seq_printf(m, "%-20pI4", &conn->inet_addr);
4850
seq_printf(m, " 0x%-10x %-10u %-12d %-10d %ptT\n",
4951
conn->dialect,
5052
conn->total_credits,

fs/smb/server/mgmt/user_session.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,12 @@ static int show_proc_sessions(struct seq_file *m, void *v)
214214
down_read(&chan->conn->session_lock);
215215
ksmbd_user_session_get(session);
216216

217-
if (chan->conn->inet_addr)
218-
seq_printf(m, " %-40pI4", &chan->conn->inet_addr);
219-
else
217+
#if IS_ENABLED(CONFIG_IPV6)
218+
if (!chan->conn->inet_addr)
220219
seq_printf(m, " %-40pI6c", &chan->conn->inet6_addr);
220+
else
221+
#endif
222+
seq_printf(m, " %-40pI4", &chan->conn->inet_addr);
221223
seq_printf(m, " %-15s %-10llu %-10s\n",
222224
session_user_name(session),
223225
session->id,

0 commit comments

Comments
 (0)