rds: transport module should be auto loaded when transport is set (4c342f77) · Commits · 戴 / test

include/uapi/linux/rds.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -64,10 +64,12 @@

		/* supported values for SO_RDS_TRANSPORT */
		#define RDS_TRANS_IB 0
		#define RDS_TRANS_IWARP 1
		#define RDS_TRANS_GAP 1
		#define RDS_TRANS_TCP 2
		#define RDS_TRANS_COUNT 3
		#define RDS_TRANS_NONE (~0)
		/* don't use RDS_TRANS_IWARP - it is deprecated */
		#define RDS_TRANS_IWARP RDS_TRANS_GAP

		/* IOCTLS commands for SOL_RDS */
		#define SIOCRDSSETTOS (SIOCPROTOPRIVATE)

+17 −9

Original line number	Diff line number	Diff line
		@@ -38,6 +38,12 @@
		#include "rds.h"
		#include "loop.h"

		static char * const rds_trans_modules[] = {
		[RDS_TRANS_IB] = "rds_rdma",
		[RDS_TRANS_GAP] = NULL,
		[RDS_TRANS_TCP] = "rds_tcp",
		};

		static struct rds_transport *transports[RDS_TRANS_COUNT];
		static DECLARE_RWSEM(rds_trans_sem);

		@@ -110,18 +116,20 @@ struct rds_transport *rds_trans_get(int t_type)
		{
		struct rds_transport *ret = NULL;
		struct rds_transport *trans;
		unsigned int i;

		down_read(&rds_trans_sem);
		for (i = 0; i < RDS_TRANS_COUNT; i++) {
		trans = transports[i];

		trans = transports[t_type];
		if (!trans) {
		up_read(&rds_trans_sem);
		if (rds_trans_modules[t_type])
		request_module(rds_trans_modules[t_type]);
		down_read(&rds_trans_sem);
		trans = transports[t_type];
		}
		if (trans && trans->t_type == t_type &&
		(!trans->t_owner \|\| try_module_get(trans->t_owner))) {
		(!trans->t_owner \|\| try_module_get(trans->t_owner)))
		ret = trans;
		break;
		}
		}

		up_read(&rds_trans_sem);

		return ret;