LU-2675 build: assume __linux__ and __KERNEL__

[fs/lustre-release.git] / lustre / osc / osc_request.c

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index cd84b54..7a05587 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -38,9 +38,6 @@
 
 #include <libcfs/libcfs.h>
 
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
 
 #include <lustre_dlm.h>
 #include <lustre_net.h>
@@ -1319,7 +1316,6 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli,struct obdo *oa,
                          ergo(i == page_count - 1, poff == 0)),
                         "i: %d/%d pg: %p off: "LPU64", count: %u\n",
                         i, page_count, pg, pg->off, pg->count);
-#ifdef __linux__
                 LASSERTF(i == 0 || pg->off > pg_prev->off,
                          "i %d p_c %u pg %p [pri %lu ind %lu] off "LPU64
                          " prev_pg %p [pri %lu ind %lu] off "LPU64"\n",
@@ -1327,10 +1323,6 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli,struct obdo *oa,
                          pg->pg, page_private(pg->pg), pg->pg->index, pg->off,
                          pg_prev->pg, page_private(pg_prev->pg),
                          pg_prev->pg->index, pg_prev->off);
-#else
-                LASSERTF(i == 0 || pg->off > pg_prev->off,
-                         "i %d p_c %u\n", i, page_count);
-#endif
                 LASSERT((pga[0]->flag & OBD_BRW_SRVLOCK) ==
                         (pg->flag & OBD_BRW_SRVLOCK));
 
@@ -3333,7 +3325,6 @@ int __init osc_init(void)
        RETURN(rc);
 }
 
-#ifdef __KERNEL__
 static void /*__exit*/ osc_exit(void)
 {
        class_unregister_type(LUSTRE_OSC_NAME);
@@ -3345,4 +3336,3 @@ MODULE_DESCRIPTION("Lustre Object Storage Client (OSC)");
 MODULE_LICENSE("GPL");
 
 cfs_module(osc, LUSTRE_VERSION_STRING, osc_init, osc_exit);
-#endif