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

smb: smbdirect: make use of DEFAULT_SYMBOL_NAMESPACE and EXPORT_SYMBOL_GPL 



This is a better solution than
EXPORT_SYMBOL_FOR_MODULES(__sym, "cifs,ksmbd") as it makes
it possible to rebuild smbdirect.ko against a
running kernel and then load the existing cifs.ko and ksmbd.ko
from the running kernel.

Suggested-by: default avatarChristoph Hellwig <hch@infradead.org>
Link: https://lore.kernel.org/linux-cifs/aehrPuY60VMcYGU8@infradead.org/


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: Christoph Hellwig <hch@infradead.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 227c3d54

fs/smb/client/smbdirect.c

+2 −0
Original line number Diff line number Diff line
@@ -558,3 +558,5 @@ void smbd_debug_proc_show(struct TCP_Server_Info *server, struct seq_file *m) 
						    server->rdma_readwrite_threshold,

						    m);

}



MODULE_IMPORT_NS("SMBDIRECT");

fs/smb/server/transport_rdma.c

+2 −0
Original line number Diff line number Diff line
@@ -540,3 +540,5 @@ static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = { 
	.rdma_write	= smb_direct_rdma_write,

	.free_transport = smb_direct_free_transport,

};



MODULE_IMPORT_NS("SMBDIRECT");

fs/smb/smbdirect/accept.c

+1 −1
Original line number Diff line number Diff line
@@ -854,4 +854,4 @@ struct smbdirect_socket *smbdirect_socket_accept(struct smbdirect_socket *lsc, 


	return nsc;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_socket_accept);
 
EXPORT_SYMBOL_GPL(smbdirect_socket_accept);

fs/smb/smbdirect/connect.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int smbdirect_connect(struct smbdirect_socket *sc, const struct sockaddr *dst) 
	 */

	return 0;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connect);

EXPORT_SYMBOL_GPL(smbdirect_connect);



static int smbdirect_connect_setup_connection(struct smbdirect_socket *sc)

{
@@ -922,4 +922,4 @@ int smbdirect_connect_sync(struct smbdirect_socket *sc, 


	return 0;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connect_sync);
 
EXPORT_SYMBOL_GPL(smbdirect_connect_sync);

fs/smb/smbdirect/connection.c

+8 −8
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ bool smbdirect_connection_is_connected(struct smbdirect_socket *sc) 
		return false;

	return true;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_is_connected);

EXPORT_SYMBOL_GPL(smbdirect_connection_is_connected);



int smbdirect_connection_wait_for_connected(struct smbdirect_socket *sc)

{
@@ -779,7 +779,7 @@ int smbdirect_connection_wait_for_connected(struct smbdirect_socket *sc) 


	return 0;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_wait_for_connected);

EXPORT_SYMBOL_GPL(smbdirect_connection_wait_for_connected);



void smbdirect_connection_idle_timer_work(struct work_struct *work)

{
@@ -958,7 +958,7 @@ int smbdirect_connection_send_batch_flush(struct smbdirect_socket *sc, 


	return ret;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_send_batch_flush);

EXPORT_SYMBOL_GPL(smbdirect_connection_send_batch_flush);



struct smbdirect_send_batch *

smbdirect_init_send_batch_storage(struct smbdirect_send_batch_storage *storage,
@@ -976,7 +976,7 @@ smbdirect_init_send_batch_storage(struct smbdirect_send_batch_storage *storage, 


	return batch;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_init_send_batch_storage);

EXPORT_SYMBOL_GPL(smbdirect_init_send_batch_storage);



static int smbdirect_connection_wait_for_send_bcredit(struct smbdirect_socket *sc,

						      struct smbdirect_send_batch *batch)
@@ -1263,7 +1263,7 @@ int smbdirect_connection_send_single_iter(struct smbdirect_socket *sc, 
bcredit_failed:

	return ret;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_send_single_iter);

EXPORT_SYMBOL_GPL(smbdirect_connection_send_single_iter);



int smbdirect_connection_send_wait_zero_pending(struct smbdirect_socket *sc)

{
@@ -1288,7 +1288,7 @@ int smbdirect_connection_send_wait_zero_pending(struct smbdirect_socket *sc) 


	return 0;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_send_wait_zero_pending);

EXPORT_SYMBOL_GPL(smbdirect_connection_send_wait_zero_pending);



int smbdirect_connection_send_iter(struct smbdirect_socket *sc,

				   struct iov_iter *iter,
@@ -1373,7 +1373,7 @@ int smbdirect_connection_send_iter(struct smbdirect_socket *sc, 


	return total_count;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_send_iter);

EXPORT_SYMBOL_GPL(smbdirect_connection_send_iter);



static void smbdirect_connection_send_io_done(struct ib_cq *cq, struct ib_wc *wc)

{
@@ -1937,7 +1937,7 @@ int smbdirect_connection_recvmsg(struct smbdirect_socket *sc, 


	goto again;

}

__SMBDIRECT_EXPORT_SYMBOL__(smbdirect_connection_recvmsg);

EXPORT_SYMBOL_GPL(smbdirect_connection_recvmsg);



static bool smbdirect_map_sges_single_page(struct smbdirect_map_sges *state,

					   struct page *page, size_t off, size_t len)