Skip to content

Commit 7360778

Browse files
metze-sambasmfrench
authored andcommitted
smb: client: make use of smbdirect_socket_init()
It's much safer to initialize the whole structure at the beginning than doing it all over the place and then miss to move it if code changes. Cc: Steve French <smfrench@gmail.com> Cc: Tom Talpey <tom@talpey.com> Cc: Long Li <longli@microsoft.com> Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 5a0d5ae commit 7360778

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

fs/smb/client/smbdirect.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,13 +1398,6 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf)
13981398
struct smbdirect_recv_io *response;
13991399
int i;
14001400

1401-
INIT_LIST_HEAD(&sc->recv_io.reassembly.list);
1402-
spin_lock_init(&sc->recv_io.reassembly.lock);
1403-
sc->recv_io.reassembly.data_length = 0;
1404-
sc->recv_io.reassembly.queue_length = 0;
1405-
1406-
INIT_LIST_HEAD(&sc->recv_io.free.list);
1407-
spin_lock_init(&sc->recv_io.free.lock);
14081401
info->count_receive_queue = 0;
14091402

14101403
init_waitqueue_head(&info->wait_receive_queues);
@@ -1706,14 +1699,12 @@ static struct smbd_connection *_smbd_get_connection(
17061699
if (!info)
17071700
return NULL;
17081701
sc = &info->socket;
1702+
smbdirect_socket_init(sc);
17091703
sp = &sc->parameters;
17101704

17111705
info->initiator_depth = 1;
17121706
info->responder_resources = SMBD_CM_RESPONDER_RESOURCES;
17131707

1714-
init_waitqueue_head(&sc->status_wait);
1715-
1716-
sc->status = SMBDIRECT_SOCKET_CREATED;
17171708
rc = smbd_ia_open(info, dstaddr, port);
17181709
if (rc) {
17191710
log_rdma_event(INFO, "smbd_ia_open rc=%d\n", rc);
@@ -1823,8 +1814,6 @@ static struct smbd_connection *_smbd_get_connection(
18231814
log_rdma_event(INFO, "connecting to IP %pI4 port %d\n",
18241815
&addr_in->sin_addr, port);
18251816

1826-
init_waitqueue_head(&sc->recv_io.reassembly.wait_queue);
1827-
18281817
WARN_ON_ONCE(sc->status != SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED);
18291818
sc->status = SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING;
18301819
rc = rdma_connect(sc->rdma.cm_id, &conn_param);

0 commit comments

Comments
 (0)