LU-6142 misc: fix style issues in uapi headers

[fs/lustre-release.git] / lustre / include / uapi / linux / lustre / lustre_log_user.h

diff --git a/lustre/include/uapi/linux/lustre/lustre_log_user.h b/lustre/include/uapi/linux/lustre/lustre_log_user.h
index d9fe861..f549065 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_log_user.h
+++ b/lustre/include/uapi/linux/lustre/lustre_log_user.h
@@ -39,15 +39,7 @@
 #define _LUSTRE_LOG_USER_H
 
 #include <linux/types.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/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
@@ -58,7 +50,8 @@ static inline void logid_to_fid(struct llog_logid *id, struct lu_fid *fid)
 {
        /* 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;