From: nathan <nathan>
Date: Tue, 3 May 2005 22:13:12 +0000 (+0000)
Subject: Branch b1_4
X-Git-Tag: v1_7_100~1^25~8^2~171
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=33ee21df46bbacc6db8a73836db62f2abfb8536d;p=fs%2Flustre-release.git

Branch b1_4
b=6223
Fix this related one too.
---

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index fd55e4f..cf888d6 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -2905,12 +2905,12 @@ static int osc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 data = (struct obd_ioctl_data *)buf;
 
                 if (sizeof(*desc) > data->ioc_inllen1) {
-                        OBD_FREE(buf, len);
+                        obd_ioctl_freedata(buf, len);
                         GOTO(out, err = -EINVAL);
                 }
 
                 if (data->ioc_inllen2 < sizeof(uuid)) {
-                        OBD_FREE(buf, len);
+                        obd_ioctl_freedata(buf, len);
                         GOTO(out, err = -EINVAL);
                 }