Commit 70f08f91 authored by Enzo Matsumiya's avatar Enzo Matsumiya Committed by Steve French
Browse files

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: default avatarEnzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent fb157ed2

fs/cifs/cifsproto.h

+4 −5
Original line number Diff line number Diff line
@@ -79,11 +79,10 @@ extern char *cifs_compose_mount_options(const char *sb_mountdata, 
		const char *fullpath, const struct dfs_info3_param *ref,

		char **devname);

/* extern void renew_parental_timestamps(struct dentry *direntry);*/

extern struct mid_q_entry *AllocMidQEntry(const struct smb_hdr *smb_buffer,

					struct TCP_Server_Info *server);

extern void DeleteMidQEntry(struct mid_q_entry *midEntry);

extern void cifs_delete_mid(struct mid_q_entry *mid);

extern void cifs_mid_q_entry_release(struct mid_q_entry *midEntry);

extern struct mid_q_entry *alloc_mid(const struct smb_hdr *,

				     struct TCP_Server_Info *);

extern void delete_mid(struct mid_q_entry *mid);

extern void release_mid(struct mid_q_entry *mid);

extern void cifs_wake_up_task(struct mid_q_entry *mid);

extern int cifs_handle_standard(struct TCP_Server_Info *server,

				struct mid_q_entry *mid);

fs/cifs/cifssmb.c

+3 −3
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ cifs_echo_callback(struct mid_q_entry *mid) 
	struct TCP_Server_Info *server = mid->callback_data;

	struct cifs_credits credits = { .value = 1, .instance = 0 };



	DeleteMidQEntry(mid);

	release_mid(mid);

	add_credits(server, &credits, CIFS_ECHO_OP);

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



	queue_work(cifsiod_wq, &rdata->work);

	DeleteMidQEntry(mid);

	release_mid(mid);

	add_credits(server, &credits, 0);

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



	queue_work(cifsiod_wq, &wdata->work);

	DeleteMidQEntry(mid);

	release_mid(mid);

	add_credits(tcon->ses->server, &credits, 0);

}

fs/cifs/connect.c

+4 −4
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ cifs_abort_connection(struct TCP_Server_Info *server) 
	list_for_each_entry_safe(mid, nmid, &retry_list, qhead) {

		list_del_init(&mid->qhead);

		mid->callback(mid);

		cifs_mid_q_entry_release(mid);

		release_mid(mid);

	}



	if (cifs_rdma_enabled(server)) {
@@ -1007,7 +1007,7 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server) 
			cifs_dbg(FYI, "Callback mid %llu\n", mid_entry->mid);

			list_del_init(&mid_entry->qhead);

			mid_entry->callback(mid_entry);

			cifs_mid_q_entry_release(mid_entry);

			release_mid(mid_entry);

		}

		/* 1/8th of sec is more than enough time for them to exit */

		msleep(125);
@@ -1246,7 +1246,7 @@ cifs_demultiplex_thread(void *p) 
		if (length < 0) {

			for (i = 0; i < num_mids; i++)

				if (mids[i])

					cifs_mid_q_entry_release(mids[i]);

					release_mid(mids[i]);

			continue;

		}
@@ -1273,7 +1273,7 @@ cifs_demultiplex_thread(void *p) 
				if (!mids[i]->multiRsp || mids[i]->multiEnd)

					mids[i]->callback(mids[i]);



				cifs_mid_q_entry_release(mids[i]);

				release_mid(mids[i]);

			} else if (server->ops->is_oplock_break &&

				   server->ops->is_oplock_break(bufs[i],

								server)) {

fs/cifs/smb2ops.c

+1 −1
Original line number Diff line number Diff line
@@ -5099,7 +5099,7 @@ static void smb2_decrypt_offload(struct work_struct *work) 
				spin_unlock(&dw->server->srv_lock);

			}

		}

		cifs_mid_q_entry_release(mid);

		release_mid(mid);

	}



free_pages:

fs/cifs/smb2pdu.c

+3 −3
Original line number Diff line number Diff line
@@ -3776,7 +3776,7 @@ smb2_echo_callback(struct mid_q_entry *mid) 
		credits.instance = server->reconnect_instance;

	}



	DeleteMidQEntry(mid);

	release_mid(mid);

	add_credits(server, &credits, CIFS_ECHO_OP);

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



	queue_work(cifsiod_wq, &rdata->work);

	DeleteMidQEntry(mid);

	release_mid(mid);

	add_credits(server, &credits, 0);

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



	queue_work(cifsiod_wq, &wdata->work);

	DeleteMidQEntry(mid);

	release_mid(mid);

	add_credits(server, &credits, 0);

}