Skip to content

Commit aa43bb2

Browse files
metze-sambasmfrench
metze-samba
authored and
smfrench
committed
smb: smbdirect: remove unused SMBDIRECT_USE_INLINE_C_FILES logic
We always build as standalone module (or as part of the core kernel). This also removes unused elements from struct smbdirect_socket and unused exports. Cc: Steve French <smfrench@gmail.com> Cc: Tom Talpey <tom@talpey.com> Cc: Long Li <longli@microsoft.com> Cc: Namjae Jeon <linkinjeon@kernel.org> Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Signed-off-by: Stefan Metzmacher <metze@samba.org> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 649c475 commit aa43bb2

12 files changed

Lines changed: 3 additions & 233 deletions

‎fs/smb/common/smbdirect/smbdirect_accept.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ static int smbdirect_accept_init_params(struct smbdirect_socket *sc);
1515
static void smbdirect_accept_negotiate_recv_done(struct ib_cq *cq, struct ib_wc *wc);
1616
static void smbdirect_accept_negotiate_send_done(struct ib_cq *cq, struct ib_wc *wc);
1717

18-
__SMBDIRECT_PUBLIC__
1918
int smbdirect_accept_connect_request(struct smbdirect_socket *sc,
2019
const struct rdma_conn_param *param)
2120
{
@@ -161,7 +160,6 @@ int smbdirect_accept_connect_request(struct smbdirect_socket *sc,
161160
init_params_failed:
162161
return ret;
163162
}
164-
__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_accept_connect_request);
165163

166164
static int smbdirect_accept_init_params(struct smbdirect_socket *sc)
167165
{
@@ -793,7 +791,6 @@ static long smbdirect_socket_wait_for_accept(struct smbdirect_socket *lsc, long
793791
return 0;
794792
}
795793

796-
__SMBDIRECT_PUBLIC__
797794
struct smbdirect_socket *smbdirect_socket_accept(struct smbdirect_socket *lsc,
798795
long timeo,
799796
struct proto_accept_arg *arg)

‎fs/smb/common/smbdirect/smbdirect_all_c_files.c‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎fs/smb/common/smbdirect/smbdirect_connect.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ static int smbdirect_connect_negotiate_start(struct smbdirect_socket *sc);
1616
static void smbdirect_connect_negotiate_send_done(struct ib_cq *cq, struct ib_wc *wc);
1717
static void smbdirect_connect_negotiate_recv_done(struct ib_cq *cq, struct ib_wc *wc);
1818

19-
__SMBDIRECT_PUBLIC__
2019
int smbdirect_connect(struct smbdirect_socket *sc, const struct sockaddr *dst)
2120
{
2221
const struct sockaddr *src = NULL;
@@ -895,7 +894,6 @@ static void smbdirect_connect_negotiate_recv_work(struct work_struct *work)
895894
smbdirect_connection_negotiation_done(sc);
896895
}
897896

898-
__SMBDIRECT_PUBLIC__
899897
int smbdirect_connect_sync(struct smbdirect_socket *sc,
900898
const struct sockaddr *dst)
901899
{

‎fs/smb/common/smbdirect/smbdirect_connection.c‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ static ssize_t smbdirect_map_sges_from_iter(struct iov_iter *iter, size_t len,
2222
static void smbdirect_connection_recv_io_refill_work(struct work_struct *work);
2323
static void smbdirect_connection_send_immediate_work(struct work_struct *work);
2424

25-
__maybe_unused /* this is temporary while this file is included in others */
2625
static void smbdirect_connection_qp_event_handler(struct ib_event *event, void *context)
2726
{
2827
struct smbdirect_socket *sc = context;
@@ -143,7 +142,6 @@ static int smbdirect_connection_rdma_event_handler(struct rdma_cm_id *id,
143142
return 0;
144143
}
145144

146-
__SMBDIRECT_PRIVATE__
147145
void smbdirect_connection_rdma_established(struct smbdirect_socket *sc)
148146
{
149147
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
@@ -157,7 +155,6 @@ void smbdirect_connection_rdma_established(struct smbdirect_socket *sc)
157155
sc->rdma.expected_event = RDMA_CM_EVENT_DISCONNECTED;
158156
}
159157

160-
__SMBDIRECT_PRIVATE__
161158
void smbdirect_connection_negotiation_done(struct smbdirect_socket *sc)
162159
{
163160
if (unlikely(sc->first_error))
@@ -242,7 +239,6 @@ static u32 smbdirect_rdma_rw_send_wrs(struct ib_device *dev,
242239
return factor * attr->cap.max_rdma_ctxs;
243240
}
244241

245-
__SMBDIRECT_PRIVATE__
246242
int smbdirect_connection_create_qp(struct smbdirect_socket *sc)
247243
{
248244
const struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -400,7 +396,6 @@ int smbdirect_connection_create_qp(struct smbdirect_socket *sc)
400396
return ret;
401397
}
402398

403-
__SMBDIRECT_PRIVATE__
404399
void smbdirect_connection_destroy_qp(struct smbdirect_socket *sc)
405400
{
406401
if (sc->ib.qp) {
@@ -422,7 +417,6 @@ void smbdirect_connection_destroy_qp(struct smbdirect_socket *sc)
422417
}
423418
}
424419

425-
__SMBDIRECT_PRIVATE__
426420
int smbdirect_connection_create_mem_pools(struct smbdirect_socket *sc)
427421
{
428422
const struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -500,7 +494,6 @@ int smbdirect_connection_create_mem_pools(struct smbdirect_socket *sc)
500494
return -ENOMEM;
501495
}
502496

503-
__SMBDIRECT_PRIVATE__
504497
void smbdirect_connection_destroy_mem_pools(struct smbdirect_socket *sc)
505498
{
506499
struct smbdirect_recv_io *recv_io, *next_io;
@@ -528,7 +521,6 @@ void smbdirect_connection_destroy_mem_pools(struct smbdirect_socket *sc)
528521
sc->send_io.mem.cache = NULL;
529522
}
530523

531-
__SMBDIRECT_PRIVATE__
532524
struct smbdirect_send_io *smbdirect_connection_alloc_send_io(struct smbdirect_socket *sc)
533525
{
534526
struct smbdirect_send_io *msg;
@@ -543,7 +535,6 @@ struct smbdirect_send_io *smbdirect_connection_alloc_send_io(struct smbdirect_so
543535
return msg;
544536
}
545537

546-
__SMBDIRECT_PRIVATE__
547538
void smbdirect_connection_free_send_io(struct smbdirect_send_io *msg)
548539
{
549540
struct smbdirect_socket *sc = msg->socket;
@@ -575,7 +566,6 @@ void smbdirect_connection_free_send_io(struct smbdirect_send_io *msg)
575566
mempool_free(msg, sc->send_io.mem.pool);
576567
}
577568

578-
__SMBDIRECT_PRIVATE__
579569
struct smbdirect_recv_io *smbdirect_connection_get_recv_io(struct smbdirect_socket *sc)
580570
{
581571
struct smbdirect_recv_io *msg = NULL;
@@ -595,7 +585,6 @@ struct smbdirect_recv_io *smbdirect_connection_get_recv_io(struct smbdirect_sock
595585
return msg;
596586
}
597587

598-
__SMBDIRECT_PRIVATE__
599588
void smbdirect_connection_put_recv_io(struct smbdirect_recv_io *msg)
600589
{
601590
struct smbdirect_socket *sc = msg->socket;
@@ -617,7 +606,6 @@ void smbdirect_connection_put_recv_io(struct smbdirect_recv_io *msg)
617606
queue_work(sc->workqueues.refill, &sc->recv_io.posted.refill_work);
618607
}
619608

620-
__SMBDIRECT_PRIVATE__
621609
void smbdirect_connection_reassembly_append_recv_io(struct smbdirect_socket *sc,
622610
struct smbdirect_recv_io *msg,
623611
u32 data_length)
@@ -639,7 +627,6 @@ void smbdirect_connection_reassembly_append_recv_io(struct smbdirect_socket *sc,
639627
sc->statistics.enqueue_reassembly_queue++;
640628
}
641629

642-
__SMBDIRECT_PRIVATE__
643630
struct smbdirect_recv_io *
644631
smbdirect_connection_reassembly_first_recv_io(struct smbdirect_socket *sc)
645632
{
@@ -652,7 +639,6 @@ smbdirect_connection_reassembly_first_recv_io(struct smbdirect_socket *sc)
652639
return msg;
653640
}
654641

655-
__SMBDIRECT_PRIVATE__
656642
void smbdirect_connection_negotiate_rdma_resources(struct smbdirect_socket *sc,
657643
u8 peer_initiator_depth,
658644
u8 peer_responder_resources,
@@ -714,7 +700,6 @@ void smbdirect_connection_negotiate_rdma_resources(struct smbdirect_socket *sc,
714700
peer_responder_resources);
715701
}
716702

717-
__SMBDIRECT_PUBLIC__
718703
bool smbdirect_connection_is_connected(struct smbdirect_socket *sc)
719704
{
720705
if (unlikely(!sc || sc->first_error || sc->status != SMBDIRECT_SOCKET_CONNECTED))
@@ -723,7 +708,6 @@ bool smbdirect_connection_is_connected(struct smbdirect_socket *sc)
723708
}
724709
__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_is_connected);
725710

726-
__SMBDIRECT_PUBLIC__
727711
int smbdirect_connection_wait_for_connected(struct smbdirect_socket *sc)
728712
{
729713
const struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -797,7 +781,6 @@ int smbdirect_connection_wait_for_connected(struct smbdirect_socket *sc)
797781
}
798782
__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_wait_for_connected);
799783

800-
__SMBDIRECT_PRIVATE__
801784
void smbdirect_connection_idle_timer_work(struct work_struct *work)
802785
{
803786
struct smbdirect_socket *sc =
@@ -829,7 +812,6 @@ void smbdirect_connection_idle_timer_work(struct work_struct *work)
829812
queue_work(sc->workqueues.immediate, &sc->idle.immediate_work);
830813
}
831814

832-
__SMBDIRECT_PRIVATE__
833815
u16 smbdirect_connection_grant_recv_credits(struct smbdirect_socket *sc)
834816
{
835817
int missing;
@@ -867,7 +849,6 @@ u16 smbdirect_connection_grant_recv_credits(struct smbdirect_socket *sc)
867849
return new_credits;
868850
}
869851

870-
__maybe_unused /* this is temporary while this file is included in others */
871852
static bool smbdirect_connection_request_keep_alive(struct smbdirect_socket *sc)
872853
{
873854
const struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -886,7 +867,6 @@ static bool smbdirect_connection_request_keep_alive(struct smbdirect_socket *sc)
886867
return false;
887868
}
888869

889-
__SMBDIRECT_PRIVATE__
890870
int smbdirect_connection_post_send_wr(struct smbdirect_socket *sc,
891871
struct ib_send_wr *wr)
892872
{
@@ -919,7 +899,6 @@ static void smbdirect_connection_send_batch_init(struct smbdirect_send_batch *ba
919899
batch->credit = 0;
920900
}
921901

922-
__SMBDIRECT_PUBLIC__
923902
int smbdirect_connection_send_batch_flush(struct smbdirect_socket *sc,
924903
struct smbdirect_send_batch *batch,
925904
bool is_last)
@@ -981,7 +960,6 @@ int smbdirect_connection_send_batch_flush(struct smbdirect_socket *sc,
981960
}
982961
__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_send_batch_flush);
983962

984-
__SMBDIRECT_PUBLIC__
985963
struct smbdirect_send_batch *
986964
smbdirect_init_send_batch_storage(struct smbdirect_send_batch_storage *storage,
987965
bool need_invalidate_rkey,
@@ -1098,7 +1076,6 @@ static int smbdirect_connection_post_send_io(struct smbdirect_socket *sc,
10981076
return smbdirect_connection_post_send_wr(sc, &msg->wr);
10991077
}
11001078

1101-
__SMBDIRECT_PUBLIC__
11021079
int smbdirect_connection_send_single_iter(struct smbdirect_socket *sc,
11031080
struct smbdirect_send_batch *batch,
11041081
struct iov_iter *iter,
@@ -1288,7 +1265,6 @@ int smbdirect_connection_send_single_iter(struct smbdirect_socket *sc,
12881265
}
12891266
__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_send_single_iter);
12901267

1291-
__SMBDIRECT_PUBLIC__
12921268
int smbdirect_connection_send_wait_zero_pending(struct smbdirect_socket *sc)
12931269
{
12941270
/*
@@ -1314,7 +1290,6 @@ int smbdirect_connection_send_wait_zero_pending(struct smbdirect_socket *sc)
13141290
}
13151291
__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_send_wait_zero_pending);
13161292

1317-
__SMBDIRECT_PUBLIC__
13181293
int smbdirect_connection_send_iter(struct smbdirect_socket *sc,
13191294
struct iov_iter *iter,
13201295
unsigned int flags,
@@ -1465,8 +1440,6 @@ static void smbdirect_connection_send_io_done(struct ib_cq *cq, struct ib_wc *wc
14651440

14661441
if (atomic_dec_and_test(&sc->send_io.pending.count))
14671442
wake_up(&sc->send_io.pending.zero_wait_queue);
1468-
1469-
wake_up(&sc->send_io.pending.dec_wait_queue);
14701443
}
14711444

14721445
static void smbdirect_connection_send_immediate_work(struct work_struct *work)
@@ -1490,7 +1463,6 @@ static void smbdirect_connection_send_immediate_work(struct work_struct *work)
14901463
}
14911464
}
14921465

1493-
__SMBDIRECT_PRIVATE__
14941466
int smbdirect_connection_post_recv_io(struct smbdirect_recv_io *msg)
14951467
{
14961468
struct smbdirect_socket *sc = msg->socket;
@@ -1532,7 +1504,6 @@ int smbdirect_connection_post_recv_io(struct smbdirect_recv_io *msg)
15321504
return ret;
15331505
}
15341506

1535-
__SMBDIRECT_PRIVATE__
15361507
void smbdirect_connection_recv_io_done(struct ib_cq *cq, struct ib_wc *wc)
15371508
{
15381509
struct smbdirect_recv_io *recv_io =
@@ -1702,7 +1673,6 @@ void smbdirect_connection_recv_io_done(struct ib_cq *cq, struct ib_wc *wc)
17021673
smbdirect_socket_schedule_cleanup(sc, -ECONNABORTED);
17031674
}
17041675

1705-
__SMBDIRECT_PRIVATE__
17061676
int smbdirect_connection_recv_io_refill(struct smbdirect_socket *sc)
17071677
{
17081678
int missing;
@@ -1818,7 +1788,6 @@ static void smbdirect_connection_recv_io_refill_work(struct work_struct *work)
18181788
}
18191789
}
18201790

1821-
__SMBDIRECT_PUBLIC__
18221791
int smbdirect_connection_recvmsg(struct smbdirect_socket *sc,
18231792
struct msghdr *msg,
18241793
unsigned int flags)

‎fs/smb/common/smbdirect/smbdirect_debug.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "smbdirect_internal.h"
88
#include <linux/seq_file.h>
99

10-
__SMBDIRECT_PUBLIC__
1110
void smbdirect_connection_legacy_debug_proc_show(struct smbdirect_socket *sc,
1211
unsigned int rdma_readwrite_threshold,
1312
struct seq_file *m)

0 commit comments

Comments
 (0)