smb: client: replace function pointers of common operations for thehw24-hc-wip

common function

Signed-off-by: Henrique Carvalho <henrique.carvalho@suse.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/fs/smb/client/transport.c b/fs/smb/client/transport.c
index 1de3bcdfd1b2..1a7bbea27344 100644
--- a/fs/smb/client/transport.c
+++ b/fs/smb/client/transport.c
@@ -56,7 +56,7 @@ void __release_mid(struct kref *refcount)
 	    (midEntry->mid_state == MID_RESPONSE_RECEIVED ||
 	     midEntry->mid_state == MID_RESPONSE_READY) &&
 	    server->ops->handle_cancelled_mid)
-		server->ops->handle_cancelled_mid(midEntry, server);
+		smb2_handle_cancelled_mid(midEntry, server);
 
 	midEntry->mid_state = MID_FREE;
 	atomic_dec(&mid_count);
@@ -461,7 +461,7 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int num_credits,
 
 	*instance = 0;
 
-	credits = server->ops->get_credits_field(server, optype);
+	credits = smb2_get_credits_field(server, optype);
 	/* Since an echo is already inflight, no need to wait to send another */
 	if (*credits <= 0 && optype == CIFS_ECHO_OP)
 		return -EAGAIN;
@@ -610,7 +610,7 @@ wait_for_compound_request(struct TCP_Server_Info *server, int num,
 	int *credits;
 	int scredits, in_flight;
 
-	credits = server->ops->get_credits_field(server, flags & CIFS_OP_MASK);
+	credits = smb2_get_credits_field(server, flags & CIFS_OP_MASK);
 
 	spin_lock(&server->req_lock);
 	scredits = *credits;
@@ -714,7 +714,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,
 		return -EAGAIN;
 	}
 
-	mid = server->ops->setup_async_request(server, rqst);
+	mid = smb2_setup_async_request(server, rqst);
 	if (IS_ERR(mid)) {
 		cifs_server_unlock(server);
 		add_credits_and_wake_if(server, &credits, optype);
@@ -799,7 +799,7 @@ cifs_compound_callback(struct mid_q_entry *mid)
 {
 	struct TCP_Server_Info *server = mid->server;
 	struct cifs_credits credits = {
-		.value = server->ops->get_credits(mid),
+		.value = smb2_get_credits(mid),
 		.instance = server->reconnect_instance,
 	};
 
@@ -950,7 +950,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
 	}
 
 	for (i = 0; i < num_rqst; i++) {
-		midQ[i] = server->ops->setup_request(ses, server, &rqst[i]);
+		midQ[i] = smb2_setup_request(ses, server, &rqst[i]);
 		if (IS_ERR(midQ[i])) {
 			revert_current_mid(server, i);
 			for (j = 0; j < i; j++)
@@ -1069,7 +1069,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
 		else
 			resp_buf_type[i] = CIFS_SMALL_BUFFER;
 
-		rc = server->ops->check_receive(midQ[i], server,
+		rc = smb2_check_receive(midQ[i], server,
 						     flags & CIFS_LOG_ERROR);
 
 		/* mark it so buf will not be freed by delete_mid */
@@ -1195,13 +1195,13 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)
 	server->total_read += length;
 
 	if (server->ops->is_session_expired &&
-	    server->ops->is_session_expired(buf)) {
+	    smb2_is_session_expired(buf)) {
 		cifs_reconnect(server, true);
 		return -1;
 	}
 
 	if (server->ops->is_status_pending &&
-	    server->ops->is_status_pending(buf, server)) {
+	    smb2_is_status_pending(buf, server)) {
 		cifs_discard_remaining_data(server);
 		return -1;
 	}
@@ -1218,7 +1218,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)
 		 rdata->iov[1].iov_base, rdata->iov[1].iov_len);
 
 	/* Was the SMB read successful? */
-	rdata->result = server->ops->map_error(buf, false);
+	rdata->result = map_smb2_to_linux_error(buf, false);
 	if (rdata->result != 0) {
 		cifs_dbg(FYI, "%s: server returned error %d\n",
 			 __func__, rdata->result);
@@ -1235,7 +1235,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)
 		return cifs_readv_discard(server, mid);
 	}
 
-	data_offset = server->ops->read_data_offset(buf) +
+	data_offset = smb2_read_data_offset(buf) +
 		HEADER_PREAMBLE_SIZE(server);
 	if (data_offset < server->total_read) {
 		/*
@@ -1271,7 +1271,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)
 #ifdef CONFIG_CIFS_SMB_DIRECT
 	use_rdma_mr = rdata->mr;
 #endif
-	data_len = server->ops->read_data_length(buf, use_rdma_mr);
+	data_len = smb2_read_data_length(buf, use_rdma_mr);
 	if (!use_rdma_mr && (data_offset + data_len > buflen)) {
 		/* data_len is corrupt -- discard frame */
 		rdata->result = -EIO;