b=16227

i=adilger
i=shadow

add lsm argument to obd_get_info. For some get_info calls the lsm was being sent as part of the key which was a hack. Now lsm can be sent as an argument.

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 8b44010..1da8006 100644 (file)
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -1339,7 +1339,7 @@ static int ost_get_info(struct obd_export *exp, struct ptlrpc_request *req)
         keylen = lustre_msg_buflen(req->rq_reqmsg, REQ_REC_OFF);
 
         /* call once to get the size to allocate the reply buffer */
-        rc = obd_get_info(exp, keylen, key, &size[1], NULL);
+        rc = obd_get_info(exp, keylen, key, &size[1], NULL, NULL);
         if (rc)
                 RETURN(rc);
 
@@ -1349,7 +1349,7 @@ static int ost_get_info(struct obd_export *exp, struct ptlrpc_request *req)
 
         reply = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(*reply));
         /* call again to fill in the reply buffer */
-        rc = obd_get_info(exp, keylen, key, size, reply);
+        rc = obd_get_info(exp, keylen, key, size, reply, NULL);
         lustre_msg_set_status(req->rq_repmsg, 0);
 
         RETURN(rc);