liblustre: fix user level build

diff --git a/lustre/fld/autoMakefile.am b/lustre/fld/autoMakefile.am
index ceea4f6..bb6c212 100644 (file)
--- a/lustre/fld/autoMakefile.am
+++ b/lustre/fld/autoMakefile.am
@@ -5,7 +5,7 @@
 
 if LIBLUSTRE
 noinst_LIBRARIES = libfld.a
-libfld_a_SOURCES = fld_handler.c fld_request.c fld_cache.c fld_index.c lproc_fld.c fld_internal.h
+libfld_a_SOURCES = fld_handler.c fld_request.c fld_cache.c lproc_fld.c fld_internal.h
 libfld_a_CPPFLAGS = $(LLCPPFLAGS)
 libfld_a_CFLAGS = $(LLCFLAGS)
 endif

diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c
index 3fb89e7..038e9d5 100644 (file)
--- a/lustre/fld/fld_request.c
+++ b/lustre/fld/fld_request.c
@@ -263,7 +263,10 @@ static inline int hash_is_sane(int hash)
 int fld_client_init(struct lu_client_fld *fld,
                     const char *uuid, int hash)
 {
-        int cache_size, cache_threshold, rc = 0;
+#ifdef __KERNEL__
+        int cache_size, cache_threshold;
+#endif
+        int rc;
         ENTRY;
 
         LASSERT(fld != NULL);
@@ -284,10 +287,10 @@ int fld_client_init(struct lu_client_fld *fld,
 #ifdef __KERNEL__
         cache_size = FLD_CACHE_SIZE /
                 sizeof(struct fld_cache_entry);
-        
+
         cache_threshold = cache_size *
                 FLD_CACHE_THRESHOLD / 100;
-        
+
         fld->fld_cache = fld_cache_init(FLD_HTABLE_SIZE,
                                         cache_size,
                                         cache_threshold);