Commit 6a86a4cc authored by David Howells's avatar David Howells Committed by Steve French
Browse files

cifs: Fix specification of function pointers 



Change the mid_receive_t, mid_callback_t and mid_handle_t function pointers
to have the pointer marker in the typedef.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarPaulo Alcantara (Red Hat) <pc@manguebit.org>
cc: linux-cifs@vger.kernel.org
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 28405cb5

fs/smb/client/cifsglob.h

+6 −6
Original line number Diff line number Diff line
@@ -1660,7 +1660,7 @@ static inline void cifs_stats_bytes_read(struct cifs_tcon *tcon, 
 * Returns zero on a successful receive, or an error. The receive state in

 * the TCP_Server_Info will also be updated.

 */

typedef int (mid_receive_t)(struct TCP_Server_Info *server,

typedef int (*mid_receive_t)(struct TCP_Server_Info *server,

			    struct mid_q_entry *mid);



/*
@@ -1671,13 +1671,13 @@ typedef int (mid_receive_t)(struct TCP_Server_Info *server, 
 * - it will be called by cifsd, with no locks held

 * - the mid will be removed from any lists

 */

typedef void (mid_callback_t)(struct mid_q_entry *mid);

typedef void (*mid_callback_t)(struct mid_q_entry *mid);



/*

 * This is the protopyte for mid handle function. This is called once the mid

 * has been recognized after decryption of the message.

 */

typedef int (mid_handle_t)(struct TCP_Server_Info *server,

typedef int (*mid_handle_t)(struct TCP_Server_Info *server,

			    struct mid_q_entry *mid);



/* one of these for every pending CIFS request to the server */
@@ -1696,9 +1696,9 @@ struct mid_q_entry { 
	unsigned long when_sent; /* time when smb send finished */

	unsigned long when_received; /* when demux complete (taken off wire) */

#endif

	mid_receive_t *receive; /* call receive callback */

	mid_callback_t *callback; /* call completion callback */

	mid_handle_t *handle; /* call handle mid callback */

	mid_receive_t receive;	/* call receive callback */

	mid_callback_t callback; /* call completion callback */

	mid_handle_t handle;	/* call handle mid callback */

	void *callback_data;	  /* general purpose pointer for callback */

	struct task_struct *creator;

	void *resp_buf;		/* pointer to received SMB header */

fs/smb/client/cifsproto.h

+4 −4
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ extern bool cifs_match_ipaddr(struct sockaddr *srcaddr, struct sockaddr *rhs); 
extern int cifs_discard_remaining_data(struct TCP_Server_Info *server);

extern int cifs_call_async(struct TCP_Server_Info *server,

			   struct smb_rqst *rqst,

			mid_receive_t *receive, mid_callback_t *callback,

			mid_handle_t *handle, void *cbdata, const int flags,

			   mid_receive_t receive, mid_callback_t callback,

			   mid_handle_t handle, void *cbdata, const int flags,

			   const struct cifs_credits *exist_credits);

extern struct TCP_Server_Info *cifs_pick_channel(struct cifs_ses *ses);

extern int cifs_send_recv(const unsigned int xid, struct cifs_ses *ses,

fs/smb/client/transport.c

+2 −2
Original line number Diff line number Diff line
@@ -664,8 +664,8 @@ int wait_for_response(struct TCP_Server_Info *server, struct mid_q_entry *mid) 
 */

int

cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,

		mid_receive_t *receive, mid_callback_t *callback,

		mid_handle_t *handle, void *cbdata, const int flags,

		mid_receive_t receive, mid_callback_t callback,

		mid_handle_t handle, void *cbdata, const int flags,

		const struct cifs_credits *exist_credits)

{

	int rc;