Commit e5066499 authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French
Browse files

cifsd: remove unneeded macros 



Remove unneeded RESPONSE_BUF, REQUEST_BUF, RESPONSE_SZ, INIT_AUX_PAYLOAD,
HAS_AUX_PAYLOAD, AUX_PAYLOAD, AUX_PAYLOAD_SIZE, RESP_HDR_SIZE,
HAS_TRANSFORM_BUF and TRANSFORM_BUF macros.

Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 3161ad3a

fs/cifsd/connection.c

+7 −8
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ void ksmbd_conn_wait_idle(struct ksmbd_conn *conn) 
int ksmbd_conn_write(struct ksmbd_work *work)

{

	struct ksmbd_conn *conn = work->conn;

	struct smb_hdr *rsp_hdr = RESPONSE_BUF(work);

	struct smb_hdr *rsp_hdr = work->response_buf;

	size_t len = 0;

	int sent;

	struct kvec iov[3];
@@ -166,21 +166,20 @@ int ksmbd_conn_write(struct ksmbd_work *work) 
		return -EINVAL;

	}



	if (HAS_TRANSFORM_BUF(work)) {

	if (work->tr_buf) {

		iov[iov_idx] = (struct kvec) { work->tr_buf,

				sizeof(struct smb2_transform_hdr) };

		len += iov[iov_idx++].iov_len;

	}



	if (HAS_AUX_PAYLOAD(work)) {

		iov[iov_idx] = (struct kvec) { rsp_hdr, RESP_HDR_SIZE(work) };

	if (work->aux_payload_sz) {

		iov[iov_idx] = (struct kvec) { rsp_hdr, work->resp_hdr_sz };

		len += iov[iov_idx++].iov_len;

		iov[iov_idx] = (struct kvec) { AUX_PAYLOAD(work),

			AUX_PAYLOAD_SIZE(work) };

		iov[iov_idx] = (struct kvec) { work->aux_payload_buf, work->aux_payload_sz };

		len += iov[iov_idx++].iov_len;

	} else {

		if (HAS_TRANSFORM_BUF(work))

			iov[iov_idx].iov_len = RESP_HDR_SIZE(work);

		if (work->tr_buf)

			iov[iov_idx].iov_len = work->resp_hdr_sz;

		else

			iov[iov_idx].iov_len = get_rfc1002_len(rsp_hdr) + 4;

		iov[iov_idx].iov_base = rsp_hdr;

fs/cifsd/ksmbd_work.c

+6 −6
Original line number Diff line number Diff line
@@ -40,18 +40,18 @@ void ksmbd_free_work_struct(struct ksmbd_work *work) 
	WARN_ON(work->saved_cred != NULL);

	if (server_conf.flags & KSMBD_GLOBAL_FLAG_CACHE_TBUF &&

			work->set_trans_buf)

		ksmbd_release_buffer(RESPONSE_BUF(work));

		ksmbd_release_buffer(work->response_buf);

	else

		ksmbd_free_response(RESPONSE_BUF(work));

		ksmbd_free_response(work->response_buf);



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_CACHE_RBUF &&

			work->set_read_buf)

		ksmbd_release_buffer(AUX_PAYLOAD(work));

		ksmbd_release_buffer(work->aux_payload_buf);

	else

		ksmbd_free_response(AUX_PAYLOAD(work));

		ksmbd_free_response(work->aux_payload_buf);



	ksmbd_free_response(TRANSFORM_BUF(work));

	ksmbd_free_request(REQUEST_BUF(work));

	ksmbd_free_response(work->tr_buf);

	ksmbd_free_request(work->request_buf);

	if (work->async_id)

		ksmbd_release_id(work->conn->async_ida, work->async_id);

	kmem_cache_free(work_cache, work);

fs/cifsd/ksmbd_work.h

+5 −19
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ struct ksmbd_work { 
	struct ksmbd_tree_connect       *tcon;



	/* Pointer to received SMB header */

	char                            *request_buf;

	void                            *request_buf;

	/* Response buffer */

	char                            *response_buf;

	void                            *response_buf;



	/* Read data buffer */

	char                            *aux_payload_buf;

	void                            *aux_payload_buf;



	/* Next cmd hdr in compound req buf*/

	int                             next_smb2_rcv_hdr_off;
@@ -92,24 +92,10 @@ struct ksmbd_work { 
#define WORK_CLOSED(w)		((w)->state == KSMBD_WORK_CLOSED)

#define WORK_ACTIVE(w)		((w)->state == KSMBD_WORK_ACTIVE)



#define RESPONSE_BUF(w)		((void *)(w)->response_buf)

#define REQUEST_BUF(w)		((void *)(w)->request_buf)



#define RESPONSE_BUF_NEXT(w)	\

	((void *)((w)->response_buf + (w)->next_smb2_rsp_hdr_off))

	(((w)->response_buf + (w)->next_smb2_rsp_hdr_off))

#define REQUEST_BUF_NEXT(w)	\

	((void *)((w)->request_buf + (w)->next_smb2_rcv_hdr_off))



#define RESPONSE_SZ(w)		((w)->response_sz)



#define INIT_AUX_PAYLOAD(w)	((w)->aux_payload_buf = NULL)

#define HAS_AUX_PAYLOAD(w)	((w)->aux_payload_sz != 0)

#define AUX_PAYLOAD(w)		((void *)((w)->aux_payload_buf))

#define AUX_PAYLOAD_SIZE(w)	((w)->aux_payload_sz)

#define RESP_HDR_SIZE(w)	((w)->resp_hdr_sz)



#define HAS_TRANSFORM_BUF(w)	((w)->tr_buf != NULL)

#define TRANSFORM_BUF(w)	((void *)((w)->tr_buf))

	(((w)->request_buf + (w)->next_smb2_rcv_hdr_off))



struct ksmbd_work *ksmbd_alloc_work_struct(void);

void ksmbd_free_work_struct(struct ksmbd_work *work);

fs/cifsd/oplock.c

+7 −7
Original line number Diff line number Diff line
@@ -608,14 +608,14 @@ static inline int allocate_oplock_break_buf(struct ksmbd_work *work) 
 * There are two ways this function can be called. 1- while file open we break

 * from exclusive/batch lock to levelII oplock and 2- while file write/truncate

 * we break from levelII oplock no oplock.

 * REQUEST_BUF(work) contains oplock_info.

 * work->request_buf contains oplock_info.

 */

static void __smb2_oplock_break_noti(struct work_struct *wk)

{

	struct smb2_oplock_break *rsp = NULL;

	struct ksmbd_work *work = container_of(wk, struct ksmbd_work, work);

	struct ksmbd_conn *conn = work->conn;

	struct oplock_break_info *br_info = REQUEST_BUF(work);

	struct oplock_break_info *br_info = work->request_buf;

	struct smb2_hdr *rsp_hdr;

	struct ksmbd_file *fp;
@@ -634,7 +634,7 @@ static void __smb2_oplock_break_noti(struct work_struct *wk) 
		return;

	}



	rsp_hdr = RESPONSE_BUF(work);

	rsp_hdr = work->response_buf;

	memset(rsp_hdr, 0, sizeof(struct smb2_hdr) + 2);

	rsp_hdr->smb2_buf_length = cpu_to_be32(HEADER_SIZE_NO_BUF_LEN(conn));

	rsp_hdr->ProtocolId = SMB2_PROTO_NUMBER;
@@ -650,7 +650,7 @@ static void __smb2_oplock_break_noti(struct work_struct *wk) 
	memset(rsp_hdr->Signature, 0, 16);





	rsp = RESPONSE_BUF(work);

	rsp = work->response_buf;



	rsp->StructureSize = cpu_to_le16(24);

	if (!br_info->open_trunc &&
@@ -730,7 +730,7 @@ static void __smb2_lease_break_noti(struct work_struct *wk) 
{

	struct smb2_lease_break *rsp = NULL;

	struct ksmbd_work *work = container_of(wk, struct ksmbd_work, work);

	struct lease_break_info *br_info = REQUEST_BUF(work);

	struct lease_break_info *br_info = work->request_buf;

	struct ksmbd_conn *conn = work->conn;

	struct smb2_hdr *rsp_hdr;
@@ -741,7 +741,7 @@ static void __smb2_lease_break_noti(struct work_struct *wk) 
		return;

	}



	rsp_hdr = RESPONSE_BUF(work);

	rsp_hdr = work->response_buf;

	memset(rsp_hdr, 0, sizeof(struct smb2_hdr) + 2);

	rsp_hdr->smb2_buf_length = cpu_to_be32(HEADER_SIZE_NO_BUF_LEN(conn));

	rsp_hdr->ProtocolId = SMB2_PROTO_NUMBER;
@@ -756,7 +756,7 @@ static void __smb2_lease_break_noti(struct work_struct *wk) 
	rsp_hdr->SessionId = 0;

	memset(rsp_hdr->Signature, 0, 16);



	rsp = RESPONSE_BUF(work);

	rsp = work->response_buf;

	rsp->StructureSize = cpu_to_le16(44);

	rsp->Reserved = 0;

	rsp->Flags = 0;

fs/cifsd/server.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static inline int check_conn_state(struct ksmbd_work *work) 
	struct smb_hdr *rsp_hdr;



	if (ksmbd_conn_exiting(work) || ksmbd_conn_need_reconnect(work)) {

		rsp_hdr = RESPONSE_BUF(work);

		rsp_hdr = work->response_buf;

		rsp_hdr->Status.CifsError = STATUS_CONNECTION_DISCONNECTED;

		return 1;

	}
@@ -169,7 +169,7 @@ static void __handle_ksmbd_work(struct ksmbd_work *work, 
		return;



	if (conn->ops->is_transform_hdr &&

		conn->ops->is_transform_hdr(REQUEST_BUF(work))) {

		conn->ops->is_transform_hdr(work->request_buf)) {

		rc = conn->ops->decrypt_req(work);

		if (rc < 0) {

			conn->ops->set_rsp_status(work, STATUS_DATA_ERROR);