Commit abe5b71c authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Steve French
Browse files

smb: client: change smbd_deregister_mr() to return void 



No callers checks the return value and this makes further
changes easier.

Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent e487f13c

fs/smb/client/smbdirect.c

+1 −3
Original line number Diff line number Diff line
@@ -2612,7 +2612,7 @@ static void local_inv_done(struct ib_cq *cq, struct ib_wc *wc) 
 * and we have to locally invalidate the buffer to prevent data is being

 * modified by remote peer after upper layer consumes it

 */

int smbd_deregister_mr(struct smbdirect_mr_io *smbdirect_mr)

void smbd_deregister_mr(struct smbdirect_mr_io *smbdirect_mr)

{

	struct ib_send_wr *wr;

	struct smbdirect_socket *sc = smbdirect_mr->socket;
@@ -2662,8 +2662,6 @@ int smbd_deregister_mr(struct smbdirect_mr_io *smbdirect_mr) 
done:

	if (atomic_dec_and_test(&sc->mr_io.used.count))

		wake_up(&sc->mr_io.cleanup.wait_queue);



	return rc;

}



static bool smb_set_sge(struct smb_extract_to_rdma *rdma,

fs/smb/client/smbdirect.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int smbd_send(struct TCP_Server_Info *server, 
struct smbdirect_mr_io *smbd_register_mr(

	struct smbd_connection *info, struct iov_iter *iter,

	bool writing, bool need_invalidate);

int smbd_deregister_mr(struct smbdirect_mr_io *mr);

void smbd_deregister_mr(struct smbdirect_mr_io *mr);



#else

#define cifs_rdma_enabled(server)	0