From: johann <johann>
Date: Mon, 26 Jan 2009 13:45:28 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: GIT_EPOCH_B1_6~2^5~223
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9745a858480824ac4531eb99616c2d51d1ad932b;p=fs%2Flustre-release.git

Branch b1_6
b=18307
i=adilger
i=shadow

send OST_CONNECT to OST_REQUEST_PORTAL instead of OST_IO_PORTAL (was used
for compatibility with releases < 1.4.6)
---

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index c3c6189..00c2ded 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -209,12 +209,7 @@ int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf)
         /* In a more perfect world, we would hang a ptlrpc_client off of
          * obd_type and just use the values from there. */
         if (!strcmp(name, LUSTRE_OSC_NAME)) {
-#ifdef __KERNEL__
-                /* Can be removed in Lustre 1.8, for compatibility only */
-                rq_portal = OST_IO_PORTAL;
-#else
                 rq_portal = OST_REQUEST_PORTAL;
-#endif
                 rp_portal = OSC_REPLY_PORTAL;
                 connect_op = OST_CONNECT;
         } else if (!strcmp(name, LUSTRE_MDC_NAME)) {