From: Johann Lombardi <johann@granier.local>
Date: Wed, 16 Dec 2009 12:44:56 +0000 (+0100)
Subject: b=21147 fix silent conflict with patch from bug 21379
X-Git-Tag: v1_8_1_58~24
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d628c3c74d5ea79dc69ffce549c69abe16534c8b;p=fs%2Flustre-release.git

b=21147 fix silent conflict with patch from bug 21379
---

diff --git a/lustre/quota/lproc_quota.c b/lustre/quota/lproc_quota.c
index 17c873c..475debf 100644
--- a/lustre/quota/lproc_quota.c
+++ b/lustre/quota/lproc_quota.c
@@ -288,7 +288,7 @@ int generic_quota_on(struct obd_device *obd, struct obd_quotactl *oqctl, int glo
                 }
 
                 if (rc == 0 && global && is_master)
-                        rc = obd_quotactl(obd->u.mds.mds_osc_exp, oqctl);
+                        rc = obd_quotactl(obd->u.mds.mds_lov_exp, oqctl);
         }
 
         if (is_master)