Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6d5d4d4 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: Remove server code from client_obd_setup() 



In client_obd_setup references to LUSTRE_OSP_NAME could only
happen on metadata servers, so remove them as never true

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5234f225

drivers/staging/lustre/lustre/ldlm/ldlm_lib.c

+0 −16
Original line number Diff line number Diff line
@@ -261,22 +261,6 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) 
		cli->cl_sp_me = LUSTRE_SP_CLI;

		cli->cl_sp_to = LUSTRE_SP_MDT;

		ns_type = LDLM_NS_TYPE_MDC;

	} else if (!strcmp(name, LUSTRE_OSP_NAME)) {

		if (strstr(lustre_cfg_buf(lcfg, 1), "OST") == NULL) {

			/* OSP_on_MDT for other MDTs */

			connect_op = MDS_CONNECT;

			cli->cl_sp_to = LUSTRE_SP_MDT;

			ns_type = LDLM_NS_TYPE_MDC;

			rq_portal = OUT_PORTAL;

		} else {

			/* OSP on MDT for OST */

			connect_op = OST_CONNECT;

			cli->cl_sp_to = LUSTRE_SP_OST;

			ns_type = LDLM_NS_TYPE_OSC;

			rq_portal = OST_REQUEST_PORTAL;

		}

		rp_portal = OSC_REPLY_PORTAL;

		cli->cl_sp_me = LUSTRE_SP_CLI;

	} else if (!strcmp(name, LUSTRE_MGC_NAME)) {

		rq_portal = MGS_REQUEST_PORTAL;

		rp_portal = MGC_REPLY_PORTAL;