From: kalpak <kalpak>
Date: Thu, 31 Jul 2008 07:51:05 +0000 (+0000)
Subject: b=16227
X-Git-Tag: v1_7_72~1^60~1
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=74cd73bde7e02b11a25c7f46dfb00e7c6cee2159;p=fs%2Flustre-release.git

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/llite/file.c b/lustre/llite/file.c
index 2f1be8c..53d4c30 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -653,8 +653,7 @@ static int ll_lock_to_stripe_offset(struct inode *inode, struct ldlm_lock *lock)
         struct {
                 char name[16];
                 struct ldlm_lock *lock;
-                struct lov_stripe_md *lsm;
-        } key = { .name = KEY_LOCK_TO_STRIPE, .lock = lock, .lsm = lsm };
+        } key = { .name = KEY_LOCK_TO_STRIPE, .lock = lock };
         __u32 stripe, vallen = sizeof(stripe);
         struct lov_oinfo *loinfo;
         int rc;
@@ -664,7 +663,7 @@ static int ll_lock_to_stripe_offset(struct inode *inode, struct ldlm_lock *lock)
                 GOTO(check, stripe = 0);
 
         /* get our offset in the lov */
-        rc = obd_get_info(exp, sizeof(key), &key, &vallen, &stripe);
+        rc = obd_get_info(exp, sizeof(key), &key, &vallen, &stripe, lsm);
         if (rc != 0) {
                 CERROR("obd_get_info: rc = %d\n", rc);
                 RETURN(rc);