OSDN Git Service

staging/lustre: Remove server code from client_obd_setup()
authorOleg Drokin <green@linuxhacker.ru>
Tue, 16 Feb 2016 05:46:40 +0000 (00:46 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Feb 2016 22:33:11 +0000 (14:33 -0800)
In client_obd_setup references to LUSTRE_OSP_NAME could only
happen on metadata servers, so remove them as never true

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c

index b52ffc0..774d89c 100644 (file)
@@ -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;