X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=libcfs%2Flibcfs%2Futil%2Fl_ioctl.c;h=9dcf1dbe31634bd4f0d258b5342299d15cf8ef91;hb=da677c1c4f37886ff7b8d31396645b12365c0e88;hp=dfdd8ab3c42d3dfa5f0de3a2b87438f6a766d62e;hpb=11220ac2f0d1245e14306f116f1c262662037740;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/util/l_ioctl.c b/libcfs/libcfs/util/l_ioctl.c
index dfdd8ab..9dcf1db 100644
--- a/libcfs/libcfs/util/l_ioctl.c
+++ b/libcfs/libcfs/util/l_ioctl.c
@@ -316,29 +316,28 @@ jt_ioc_dump(int argc, char **argv)
 int libcfs_ioctl_pack(struct libcfs_ioctl_data *data, char **pbuf,
                                     int max)
 {
-        char *ptr;
-        struct libcfs_ioctl_data *overlay;
-        data->ioc_len = libcfs_ioctl_packlen(data);
-        data->ioc_version = LIBCFS_IOCTL_VERSION;
-
-        if (*pbuf && libcfs_ioctl_packlen(data) > max)
-                return 1;
-        if (*pbuf == NULL) {
-                *pbuf = malloc(data->ioc_len);
-        }
-        if (!*pbuf)
-                return 1;
-        overlay = (struct libcfs_ioctl_data *)*pbuf;
-        memcpy(*pbuf, data, sizeof(*data));
-
-        ptr = overlay->ioc_bulk;
-        if (data->ioc_inlbuf1)
-                LOGL(data->ioc_inlbuf1, data->ioc_inllen1, ptr);
-        if (data->ioc_inlbuf2)
-                LOGL(data->ioc_inlbuf2, data->ioc_inllen2, ptr);
-        if (libcfs_ioctl_is_invalid(overlay))
-                return 1;
+	char *ptr;
+	struct libcfs_ioctl_data *overlay;
+	data->ioc_hdr.ioc_len = libcfs_ioctl_packlen(data);
+	data->ioc_hdr.ioc_version = LIBCFS_IOCTL_VERSION;
+
+	if (*pbuf != NULL && libcfs_ioctl_packlen(data) > max)
+		return 1;
+	if (*pbuf == NULL)
+		*pbuf = malloc(data->ioc_hdr.ioc_len);
+	if (*pbuf == NULL)
+		return 1;
+	overlay = (struct libcfs_ioctl_data *)*pbuf;
+	memcpy(*pbuf, data, sizeof(*data));
+
+	ptr = overlay->ioc_bulk;
+	if (data->ioc_inlbuf1 != NULL)
+		LOGL(data->ioc_inlbuf1, data->ioc_inllen1, ptr);
+	if (data->ioc_inlbuf2 != NULL)
+		LOGL(data->ioc_inlbuf2, data->ioc_inllen2, ptr);
+	if (libcfs_ioctl_is_invalid(overlay))
+		return 1;
 
-        return 0;
+	return 0;
 }