* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2015, 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>
#else /* __KERNEL__ */
# include <malloc.h>
# include <string.h>
+#include <libcfs/util/ioctl.h>
#endif /* !__KERNEL__ */
#if !defined(__KERNEL__) && !defined(LUSTRE_UTILS)
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, "
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;
}
#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)
+#define OBD_IOC_QUERY_LFSCK _IOR('f', 232, struct obd_ioctl_data)
/* lustre/lustre_user.h 240-249 */
/* LIBCFS_IOC_DEBUG_MASK 250 */