X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fsec_config.c;h=58703e0233cc7a5dd898427c5ae6e3f93577fe35;hb=a8d448e4cd5978c546911f98067232bcdd30b651;hp=b18b1f67977c5af1c9373a50616a9ac584781b4c;hpb=46487b52695829f7befc1c382517ca2b4076453d;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/sec_config.c b/lustre/ptlrpc/sec_config.c
index b18b1f6..58703e0 100644
--- a/lustre/ptlrpc/sec_config.c
+++ b/lustre/ptlrpc/sec_config.c
@@ -37,13 +37,8 @@
 #define DEBUG_SUBSYSTEM S_SEC
 
 #include <libcfs/libcfs.h>
-#ifndef __KERNEL__
-#include <liblustre.h>
-#include <libcfs/list.h>
-#else
 #include <linux/crypto.h>
 #include <linux/key.h>
-#endif
 
 #include <obd.h>
 #include <obd_class.h>
@@ -938,7 +933,6 @@ void sptlrpc_conf_client_adapt(struct obd_device *obd)
 }
 EXPORT_SYMBOL(sptlrpc_conf_client_adapt);
 
-#ifdef __KERNEL__
 
 static void rule2string(struct sptlrpc_rule *r, char *buf, int buflen)
 {
@@ -1151,7 +1145,6 @@ out_pop:
 	RETURN(rc);
 }
 
-#endif /* __KRENEL__ */
 
 /**
  * called by target devices, extract sptlrpc rules which applies to
@@ -1188,7 +1181,6 @@ int sptlrpc_conf_target_get_rules(struct obd_device *obd,
                 GOTO(out, rc);
         }
 
-#ifdef __KERNEL__
         if (conf->sc_updated  == 0) {
                 /*
                  * always read from local copy. here another option is
@@ -1208,7 +1200,6 @@ int sptlrpc_conf_target_get_rules(struct obd_device *obd,
                 else
                         CDEBUG(D_SEC, "unchanged, skip updating local copy\n");
         }
-#endif
 
         /* extract rule set for this target */
         conf_tgt = sptlrpc_conf_get_tgt(conf, obd->obd_name, 0);