X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_ioctl.h;h=ecc65905e5b1759a0f6aa9d04ec4ee5f0156992e;hb=c152f7b0c84cab95e55fb0ba19d0b6bdeefd6e12;hp=0b2cc828be459b3d5b3c8ca0fac207d21e4d5ddc;hpb=3f80e23eaf9dead631585c3b689549c723c164df;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_ioctl.h b/lustre/include/lustre_ioctl.h
index 0b2cc82..ecc6590 100644
--- a/lustre/include/lustre_ioctl.h
+++ b/lustre/include/lustre_ioctl.h
@@ -23,11 +23,12 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, 2014, Intel Corporation.
+ * Copyright (c) 2014, 2016, Intel Corporation.
  */
 #ifndef LUSTRE_IOCTL_H_
 #define LUSTRE_IOCTL_H_
 
+#include <linux/types.h>
 #include <libcfs/libcfs.h>
 #include <lustre/lustre_idl.h>
 
@@ -38,6 +39,7 @@
 #else /* __KERNEL__ */
 # include <malloc.h>
 # include <string.h>
+#include <libcfs/util/ioctl.h>
 #endif /* !__KERNEL__ */
 
 #if !defined(__KERNEL__) && !defined(LUSTRE_UTILS)
@@ -55,6 +57,12 @@ enum md_echo_cmd {
 	ECHO_MD_ALLOC_FID	= 8, /* Get FIDs from MDT */
 };
 
+#define OBD_DEV_ID 1
+#define OBD_DEV_NAME "obd"
+#define OBD_DEV_PATH "/dev/" OBD_DEV_NAME
+#define OBD_DEV_MAJOR 10
+#define OBD_DEV_MINOR 241
+
 #define OBD_IOCTL_VERSION	0x00010004
 #define OBD_DEV_BY_DEVNAME	0xffffd0de
 #define OBD_MAX_IOCTL_BUFFER	CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER
@@ -240,17 +248,25 @@ static inline int obd_ioctl_pack(struct obd_ioctl_data *data, char **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_inlbuf1) {
+		memcpy(ptr, data->ioc_inlbuf1, data->ioc_inllen1);
+		ptr += cfs_size_round(data->ioc_inllen1);
+	}
 
-	if (data->ioc_inlbuf2 != NULL)
-		LOGL(data->ioc_inlbuf2, data->ioc_inllen2, ptr);
+	if (data->ioc_inlbuf2) {
+		memcpy(ptr, data->ioc_inlbuf2, data->ioc_inllen2);
+		ptr += cfs_size_round(data->ioc_inllen2);
+	}
 
-	if (data->ioc_inlbuf3 != NULL)
-		LOGL(data->ioc_inlbuf3, data->ioc_inllen3, ptr);
+	if (data->ioc_inlbuf3) {
+		memcpy(ptr, data->ioc_inlbuf3, data->ioc_inllen3);
+		ptr += cfs_size_round(data->ioc_inllen3);
+	}
 
-	if (data->ioc_inlbuf4 != NULL)
-		LOGL(data->ioc_inlbuf4, data->ioc_inllen4, ptr);
+	if (data->ioc_inlbuf4) {
+		memcpy(ptr, data->ioc_inlbuf4, data->ioc_inllen4);
+		ptr += cfs_size_round(data->ioc_inllen4);
+	}
 
 	if (obd_ioctl_is_invalid(overlay)) {
 		fprintf(stderr, "invalid ioctl data: ioc_len = %u, "
@@ -282,17 +298,25 @@ obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
 	memcpy(data, pbuf, sizeof(*data));
 
 	ptr = overlay->ioc_bulk;
-	if (data->ioc_inlbuf1 != NULL)
-		LOGU(data->ioc_inlbuf1, data->ioc_inllen1, ptr);
+	if (data->ioc_inlbuf1) {
+		memcpy(data->ioc_inlbuf1, ptr, data->ioc_inllen1);
+		ptr += cfs_size_round(data->ioc_inllen1);
+	}
 
-	if (data->ioc_inlbuf2 != NULL)
-		LOGU(data->ioc_inlbuf2, data->ioc_inllen2, ptr);
+	if (data->ioc_inlbuf2) {
+		memcpy(data->ioc_inlbuf2, ptr, data->ioc_inllen2);
+		ptr += cfs_size_round(data->ioc_inllen2);
+	}
 
-	if (data->ioc_inlbuf3 != NULL)
-		LOGU(data->ioc_inlbuf3, data->ioc_inllen3, ptr);
+	if (data->ioc_inlbuf3) {
+		memcpy(data->ioc_inlbuf3, ptr, data->ioc_inllen3);
+		ptr += cfs_size_round(data->ioc_inllen3);
+	}
 
-	if (data->ioc_inlbuf4 != NULL)
-		LOGU(data->ioc_inlbuf4, data->ioc_inllen4, ptr);
+	if (data->ioc_inlbuf4) {
+		memcpy(data->ioc_inlbuf4, ptr, data->ioc_inllen4);
+		ptr += cfs_size_round(data->ioc_inllen4);
+	}
 
 	return 0;
 }
@@ -357,8 +381,8 @@ obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
 /*	OBD_IOC_LOV_GETSTRIPE	155 LL_IOC_LOV_GETSTRIPE */
 /*	OBD_IOC_LOV_SETEA	156 LL_IOC_LOV_SETEA */
 /*	lustre/lustre_user.h	157-159 */
-#define OBD_IOC_QUOTACHECK	_IOW ('f', 160, int)
-#define OBD_IOC_POLL_QUOTACHECK	_IOR ('f', 161, struct if_quotacheck *)
+/*	OBD_IOC_QUOTACHECK	_IOW ('f', 160, int) */
+/*	OBD_IOC_POLL_QUOTACHECK	_IOR ('f', 161, struct if_quotacheck *) */
 #define OBD_IOC_QUOTACTL	_IOWR('f', 162, struct if_quotactl)
 /*	lustre/lustre_user.h	163-176 */
 #define OBD_IOC_CHANGELOG_REG	_IOW ('f', 177, struct obd_ioctl_data)
@@ -369,7 +393,7 @@ obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
 /*	OBD_IOC_PARSE		_IOWR('f', 182, OBD_IOC_DATA_TYPE) */
 /*	OBD_IOC_DORECORD	_IOWR('f', 183, OBD_IOC_DATA_TYPE) */
 #define OBD_IOC_PROCESS_CFG	_IOWR('f', 184, OBD_IOC_DATA_TYPE)
-#define OBD_IOC_DUMP_LOG	_IOWR('f', 185, OBD_IOC_DATA_TYPE)
+/*	OBD_IOC_DUMP_LOG	_IOWR('f', 185, OBD_IOC_DATA_TYPE) */
 /*	OBD_IOC_CLEAR_LOG	_IOWR('f', 186, OBD_IOC_DATA_TYPE) */
 #define OBD_IOC_PARAM		_IOW ('f', 187, OBD_IOC_DATA_TYPE)
 #define OBD_IOC_POOL		_IOWR('f', 188, OBD_IOC_DATA_TYPE)
@@ -397,7 +421,8 @@ obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
 #define OBD_IOC_ECHO_ALLOC_SEQ	_IOWR('f', 222, struct obd_ioctl_data)
 #define OBD_IOC_START_LFSCK	_IOWR('f', 230, OBD_IOC_DATA_TYPE)
 #define OBD_IOC_STOP_LFSCK	_IOW ('f', 231, OBD_IOC_DATA_TYPE)
-/*	lustre/lustre_user.h	240-246 */
+#define OBD_IOC_QUERY_LFSCK	_IOR('f', 232, struct obd_ioctl_data)
+/*	lustre/lustre_user.h	240-249 */
 /*	LIBCFS_IOC_DEBUG_MASK	250 */
 
 #define IOC_OSC_SET_ACTIVE	_IOWR('h', 21, void *)