X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flov_merge.c;h=7362eadf1b21f73eac6a1a3beefafc4b4ca0727f;hb=7e41c11a83b3f70d59df7684e4aff9d58cbb632f;hp=fd7417990ed0e9c95fd0f2d55534653577eee6d9;hpb=cc2ff1bfd66a5c004eb6ed61fc2dac3f1ab49d3a;p=fs%2Flustre-release.git

diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c
index fd74179..7362ead 100644
--- a/lustre/lov/lov_merge.c
+++ b/lustre/lov/lov_merge.c
@@ -36,11 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd_class.h>
 #include "lov_internal.h"
@@ -63,9 +59,7 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
 	int rc = 0;
 
 	assert_spin_locked(&lsm->lsm_lock);
-#ifdef __KERNEL__
 	LASSERT(lsm->lsm_lock_owner == current_pid());
-#endif
 
 	CDEBUG(D_INODE, "MDT ID "DOSTID" initial value: s="LPU64" m="LPU64
 	       " a="LPU64" c="LPU64" b="LPU64"\n", POSTID(&lsm->lsm_oi),