#ifndef _LUSTRE_LOG_USER_H
#define _LUSTRE_LOG_USER_H
-/*
- * This is due to us being out of kernel and the way the OpenSFS branch
- * handles CFLAGS.
- */
-#ifdef __KERNEL__
-#include <uapi/linux/lustre/lustre_fid.h>
-#else
+#include <linux/types.h>
#include <linux/lustre/lustre_fid.h>
-#endif
/* Lustre logs use FIDs constructed from oi_id and oi_seq directly,
* without attempting to use the IGIF and IDIF ranges as is done
{
/* For compatibility purposes we identify pre-OSD (~< 2.3.51 MDS)
* logid's by non-zero ogen (inode generation) and convert them
- * into IGIF */
+ * into IGIF
+ */
if (id->lgl_ogen == 0) {
fid->f_seq = id->lgl_oi.oi.oi_seq;
fid->f_oid = id->lgl_oi.oi.oi_id;