Skip to content

Commit 70f08f9

Browse files
ematsumiyasmfrench
ematsumiya
authored and
smfrench
committed
cifs: remove useless DeleteMidQEntry()
DeleteMidQEntry() was just a proxy for cifs_mid_q_entry_release(). - remove DeleteMidQEntry() - rename cifs_mid_q_entry_release() to release_mid() - rename kref_put() callback _cifs_mid_q_entry_release to __release_mid - rename AllocMidQEntry() to alloc_mid() - rename cifs_delete_mid() to delete_mid() Update callers to use new names. Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent fb157ed commit 70f08f9

7 files changed

Lines changed: 43 additions & 49 deletions

File tree

‎fs/cifs/cifsproto.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,10 @@ extern char *cifs_compose_mount_options(const char *sb_mountdata,
7979
const char *fullpath, const struct dfs_info3_param *ref,
8080
char **devname);
8181
/* extern void renew_parental_timestamps(struct dentry *direntry);*/
82-
extern struct mid_q_entry *AllocMidQEntry(const struct smb_hdr *smb_buffer,
83-
struct TCP_Server_Info *server);
84-
extern void DeleteMidQEntry(struct mid_q_entry *midEntry);
85-
extern void cifs_delete_mid(struct mid_q_entry *mid);
86-
extern void cifs_mid_q_entry_release(struct mid_q_entry *midEntry);
82+
extern struct mid_q_entry *alloc_mid(const struct smb_hdr *,
83+
struct TCP_Server_Info *);
84+
extern void delete_mid(struct mid_q_entry *mid);
85+
extern void release_mid(struct mid_q_entry *mid);
8786
extern void cifs_wake_up_task(struct mid_q_entry *mid);
8887
extern int cifs_handle_standard(struct TCP_Server_Info *server,
8988
struct mid_q_entry *mid);

‎fs/cifs/cifssmb.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ cifs_echo_callback(struct mid_q_entry *mid)
591591
struct TCP_Server_Info *server = mid->callback_data;
592592
struct cifs_credits credits = { .value = 1, .instance = 0 };
593593

594-
DeleteMidQEntry(mid);
594+
release_mid(mid);
595595
add_credits(server, &credits, CIFS_ECHO_OP);
596596
}
597597

@@ -1336,7 +1336,7 @@ cifs_readv_callback(struct mid_q_entry *mid)
13361336
}
13371337

13381338
queue_work(cifsiod_wq, &rdata->work);
1339-
DeleteMidQEntry(mid);
1339+
release_mid(mid);
13401340
add_credits(server, &credits, 0);
13411341
}
13421342

@@ -1684,7 +1684,7 @@ cifs_writev_callback(struct mid_q_entry *mid)
16841684
}
16851685

16861686
queue_work(cifsiod_wq, &wdata->work);
1687-
DeleteMidQEntry(mid);
1687+
release_mid(mid);
16881688
add_credits(tcon->ses->server, &credits, 0);
16891689
}
16901690

‎fs/cifs/connect.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ cifs_abort_connection(struct TCP_Server_Info *server)
334334
list_for_each_entry_safe(mid, nmid, &retry_list, qhead) {
335335
list_del_init(&mid->qhead);
336336
mid->callback(mid);
337-
cifs_mid_q_entry_release(mid);
337+
release_mid(mid);
338338
}
339339

340340
if (cifs_rdma_enabled(server)) {
@@ -1007,7 +1007,7 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server)
10071007
cifs_dbg(FYI, "Callback mid %llu\n", mid_entry->mid);
10081008
list_del_init(&mid_entry->qhead);
10091009
mid_entry->callback(mid_entry);
1010-
cifs_mid_q_entry_release(mid_entry);
1010+
release_mid(mid_entry);
10111011
}
10121012
/* 1/8th of sec is more than enough time for them to exit */
10131013
msleep(125);
@@ -1246,7 +1246,7 @@ cifs_demultiplex_thread(void *p)
12461246
if (length < 0) {
12471247
for (i = 0; i < num_mids; i++)
12481248
if (mids[i])
1249-
cifs_mid_q_entry_release(mids[i]);
1249+
release_mid(mids[i]);
12501250
continue;
12511251
}
12521252

@@ -1273,7 +1273,7 @@ cifs_demultiplex_thread(void *p)
12731273
if (!mids[i]->multiRsp || mids[i]->multiEnd)
12741274
mids[i]->callback(mids[i]);
12751275

1276-
cifs_mid_q_entry_release(mids[i]);
1276+
release_mid(mids[i]);
12771277
} else if (server->ops->is_oplock_break &&
12781278
server->ops->is_oplock_break(bufs[i],
12791279
server)) {

‎fs/cifs/smb2ops.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5099,7 +5099,7 @@ static void smb2_decrypt_offload(struct work_struct *work)
50995099
spin_unlock(&dw->server->srv_lock);
51005100
}
51015101
}
5102-
cifs_mid_q_entry_release(mid);
5102+
release_mid(mid);
51035103
}
51045104

51055105
free_pages:

‎fs/cifs/smb2pdu.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3776,7 +3776,7 @@ smb2_echo_callback(struct mid_q_entry *mid)
37763776
credits.instance = server->reconnect_instance;
37773777
}
37783778

3779-
DeleteMidQEntry(mid);
3779+
release_mid(mid);
37803780
add_credits(server, &credits, CIFS_ECHO_OP);
37813781
}
37823782

@@ -4201,7 +4201,7 @@ smb2_readv_callback(struct mid_q_entry *mid)
42014201
rdata->offset, rdata->got_bytes);
42024202

42034203
queue_work(cifsiod_wq, &rdata->work);
4204-
DeleteMidQEntry(mid);
4204+
release_mid(mid);
42054205
add_credits(server, &credits, 0);
42064206
}
42074207

@@ -4440,7 +4440,7 @@ smb2_writev_callback(struct mid_q_entry *mid)
44404440
wdata->offset, wdata->bytes);
44414441

44424442
queue_work(cifsiod_wq, &wdata->work);
4443-
DeleteMidQEntry(mid);
4443+
release_mid(mid);
44444444
add_credits(server, &credits, 0);
44454445
}
44464446

‎fs/cifs/smb2transport.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ smb2_setup_request(struct cifs_ses *ses, struct TCP_Server_Info *server,
856856
rc = smb2_sign_rqst(rqst, server);
857857
if (rc) {
858858
revert_current_mid_from_hdr(server, shdr);
859-
cifs_delete_mid(mid);
859+
delete_mid(mid);
860860
return ERR_PTR(rc);
861861
}
862862

@@ -890,7 +890,7 @@ smb2_setup_async_request(struct TCP_Server_Info *server, struct smb_rqst *rqst)
890890
rc = smb2_sign_rqst(rqst, server);
891891
if (rc) {
892892
revert_current_mid_from_hdr(server, shdr);
893-
DeleteMidQEntry(mid);
893+
release_mid(mid);
894894
return ERR_PTR(rc);
895895
}
896896

‎fs/cifs/transport.c‎

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ cifs_wake_up_task(struct mid_q_entry *mid)
3939
}
4040

4141
struct mid_q_entry *
42-
AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)
42+
alloc_mid(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)
4343
{
4444
struct mid_q_entry *temp;
4545

4646
if (server == NULL) {
47-
cifs_dbg(VFS, "Null TCP session in AllocMidQEntry\n");
47+
cifs_dbg(VFS, "%s: null TCP session\n", __func__);
4848
return NULL;
4949
}
5050

@@ -74,7 +74,7 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)
7474
return temp;
7575
}
7676

77-
static void _cifs_mid_q_entry_release(struct kref *refcount)
77+
static void __release_mid(struct kref *refcount)
7878
{
7979
struct mid_q_entry *midEntry =
8080
container_of(refcount, struct mid_q_entry, refcount);
@@ -153,22 +153,17 @@ static void _cifs_mid_q_entry_release(struct kref *refcount)
153153
mempool_free(midEntry, cifs_mid_poolp);
154154
}
155155

156-
void cifs_mid_q_entry_release(struct mid_q_entry *midEntry)
156+
void release_mid(struct mid_q_entry *mid)
157157
{
158-
struct TCP_Server_Info *server = midEntry->server;
158+
struct TCP_Server_Info *server = mid->server;
159159

160160
spin_lock(&server->mid_lock);
161-
kref_put(&midEntry->refcount, _cifs_mid_q_entry_release);
161+
kref_put(&mid->refcount, __release_mid);
162162
spin_unlock(&server->mid_lock);
163163
}
164164

165-
void DeleteMidQEntry(struct mid_q_entry *midEntry)
166-
{
167-
cifs_mid_q_entry_release(midEntry);
168-
}
169-
170165
void
171-
cifs_delete_mid(struct mid_q_entry *mid)
166+
delete_mid(struct mid_q_entry *mid)
172167
{
173168
spin_lock(&mid->server->mid_lock);
174169
if (!(mid->mid_flags & MID_DELETED)) {
@@ -177,7 +172,7 @@ cifs_delete_mid(struct mid_q_entry *mid)
177172
}
178173
spin_unlock(&mid->server->mid_lock);
179174

180-
DeleteMidQEntry(mid);
175+
release_mid(mid);
181176
}
182177

183178
/*
@@ -748,7 +743,7 @@ static int allocate_mid(struct cifs_ses *ses, struct smb_hdr *in_buf,
748743
}
749744
spin_unlock(&ses->ses_lock);
750745

751-
*ppmidQ = AllocMidQEntry(in_buf, ses->server);
746+
*ppmidQ = alloc_mid(in_buf, ses->server);
752747
if (*ppmidQ == NULL)
753748
return -ENOMEM;
754749
spin_lock(&ses->server->mid_lock);
@@ -785,13 +780,13 @@ cifs_setup_async_request(struct TCP_Server_Info *server, struct smb_rqst *rqst)
785780
if (server->sign)
786781
hdr->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
787782

788-
mid = AllocMidQEntry(hdr, server);
783+
mid = alloc_mid(hdr, server);
789784
if (mid == NULL)
790785
return ERR_PTR(-ENOMEM);
791786

792787
rc = cifs_sign_rqst(rqst, server, &mid->sequence_number);
793788
if (rc) {
794-
DeleteMidQEntry(mid);
789+
release_mid(mid);
795790
return ERR_PTR(rc);
796791
}
797792

@@ -868,7 +863,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,
868863
if (rc < 0) {
869864
revert_current_mid(server, mid->credits);
870865
server->sequence_number -= 2;
871-
cifs_delete_mid(mid);
866+
delete_mid(mid);
872867
}
873868

874869
cifs_server_unlock(server);
@@ -940,7 +935,7 @@ cifs_sync_mid_result(struct mid_q_entry *mid, struct TCP_Server_Info *server)
940935
}
941936
spin_unlock(&server->mid_lock);
942937

943-
DeleteMidQEntry(mid);
938+
release_mid(mid);
944939
return rc;
945940
}
946941

@@ -1000,7 +995,7 @@ cifs_setup_request(struct cifs_ses *ses, struct TCP_Server_Info *ignored,
1000995
return ERR_PTR(rc);
1001996
rc = cifs_sign_rqst(rqst, ses->server, &mid->sequence_number);
1002997
if (rc) {
1003-
cifs_delete_mid(mid);
998+
delete_mid(mid);
1004999
return ERR_PTR(rc);
10051000
}
10061001
return mid;
@@ -1029,7 +1024,7 @@ static void
10291024
cifs_cancelled_callback(struct mid_q_entry *mid)
10301025
{
10311026
cifs_compound_callback(mid);
1032-
DeleteMidQEntry(mid);
1027+
release_mid(mid);
10331028
}
10341029

10351030
/*
@@ -1133,7 +1128,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
11331128
if (IS_ERR(midQ[i])) {
11341129
revert_current_mid(server, i);
11351130
for (j = 0; j < i; j++)
1136-
cifs_delete_mid(midQ[j]);
1131+
delete_mid(midQ[j]);
11371132
cifs_server_unlock(server);
11381133

11391134
/* Update # of requests on wire to server */
@@ -1253,7 +1248,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
12531248
rc = server->ops->check_receive(midQ[i], server,
12541249
flags & CIFS_LOG_ERROR);
12551250

1256-
/* mark it so buf will not be freed by cifs_delete_mid */
1251+
/* mark it so buf will not be freed by delete_mid */
12571252
if ((flags & CIFS_NO_RSP_BUF) == 0)
12581253
midQ[i]->resp_buf = NULL;
12591254

@@ -1285,7 +1280,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
12851280
*/
12861281
for (i = 0; i < num_rqst; i++) {
12871282
if (!cancelled_mid[i])
1288-
cifs_delete_mid(midQ[i]);
1283+
delete_mid(midQ[i]);
12891284
}
12901285

12911286
return rc;
@@ -1425,7 +1420,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,
14251420
spin_lock(&server->mid_lock);
14261421
if (midQ->mid_state == MID_REQUEST_SUBMITTED) {
14271422
/* no longer considered to be "in-flight" */
1428-
midQ->callback = DeleteMidQEntry;
1423+
midQ->callback = release_mid;
14291424
spin_unlock(&server->mid_lock);
14301425
add_credits(server, &credits, 0);
14311426
return rc;
@@ -1450,7 +1445,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,
14501445
memcpy(out_buf, midQ->resp_buf, *pbytes_returned + 4);
14511446
rc = cifs_check_receive(midQ, server, 0);
14521447
out:
1453-
cifs_delete_mid(midQ);
1448+
delete_mid(midQ);
14541449
add_credits(server, &credits, 0);
14551450

14561451
return rc;
@@ -1543,7 +1538,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
15431538

15441539
rc = cifs_sign_smb(in_buf, server, &midQ->sequence_number);
15451540
if (rc) {
1546-
cifs_delete_mid(midQ);
1541+
delete_mid(midQ);
15471542
cifs_server_unlock(server);
15481543
return rc;
15491544
}
@@ -1560,7 +1555,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
15601555
cifs_server_unlock(server);
15611556

15621557
if (rc < 0) {
1563-
cifs_delete_mid(midQ);
1558+
delete_mid(midQ);
15641559
return rc;
15651560
}
15661561

@@ -1583,7 +1578,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
15831578
blocking lock to return. */
15841579
rc = send_cancel(server, &rqst, midQ);
15851580
if (rc) {
1586-
cifs_delete_mid(midQ);
1581+
delete_mid(midQ);
15871582
return rc;
15881583
}
15891584
} else {
@@ -1595,7 +1590,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
15951590
/* If we get -ENOLCK back the lock may have
15961591
already been removed. Don't exit in this case. */
15971592
if (rc && rc != -ENOLCK) {
1598-
cifs_delete_mid(midQ);
1593+
delete_mid(midQ);
15991594
return rc;
16001595
}
16011596
}
@@ -1606,7 +1601,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
16061601
spin_lock(&server->mid_lock);
16071602
if (midQ->mid_state == MID_REQUEST_SUBMITTED) {
16081603
/* no longer considered to be "in-flight" */
1609-
midQ->callback = DeleteMidQEntry;
1604+
midQ->callback = release_mid;
16101605
spin_unlock(&server->mid_lock);
16111606
return rc;
16121607
}
@@ -1634,7 +1629,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
16341629
memcpy(out_buf, midQ->resp_buf, *pbytes_returned + 4);
16351630
rc = cifs_check_receive(midQ, server, 0);
16361631
out:
1637-
cifs_delete_mid(midQ);
1632+
delete_mid(midQ);
16381633
if (rstart && rc == -EACCES)
16391634
return -ERESTARTSYS;
16401635
return rc;

0 commit comments

Comments
 (0)