Skip to content

Commit abe5b71

Browse files
metze-sambasmfrench
authored andcommitted
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: Stefan Metzmacher <metze@samba.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent e487f13 commit abe5b71

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

fs/smb/client/smbdirect.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2612,7 +2612,7 @@ static void local_inv_done(struct ib_cq *cq, struct ib_wc *wc)
26122612
* and we have to locally invalidate the buffer to prevent data is being
26132613
* modified by remote peer after upper layer consumes it
26142614
*/
2615-
int smbd_deregister_mr(struct smbdirect_mr_io *smbdirect_mr)
2615+
void smbd_deregister_mr(struct smbdirect_mr_io *smbdirect_mr)
26162616
{
26172617
struct ib_send_wr *wr;
26182618
struct smbdirect_socket *sc = smbdirect_mr->socket;
@@ -2662,8 +2662,6 @@ int smbd_deregister_mr(struct smbdirect_mr_io *smbdirect_mr)
26622662
done:
26632663
if (atomic_dec_and_test(&sc->mr_io.used.count))
26642664
wake_up(&sc->mr_io.cleanup.wait_queue);
2665-
2666-
return rc;
26672665
}
26682666

26692667
static bool smb_set_sge(struct smb_extract_to_rdma *rdma,

fs/smb/client/smbdirect.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ int smbd_send(struct TCP_Server_Info *server,
6060
struct smbdirect_mr_io *smbd_register_mr(
6161
struct smbd_connection *info, struct iov_iter *iter,
6262
bool writing, bool need_invalidate);
63-
int smbd_deregister_mr(struct smbdirect_mr_io *mr);
63+
void smbd_deregister_mr(struct smbdirect_mr_io *mr);
6464

6565
#else
6666
#define cifs_rdma_enabled(server) 0

0 commit comments

Comments
 (0)