LU-6245 client: remove types abstraction from client code

[fs/lustre-release.git] / lustre / fld / fld_handler.c

diff --git a/lustre/fld/fld_handler.c b/lustre/fld/fld_handler.c
index 7dc26ad..902f42b 100644 (file)
--- a/lustre/fld/fld_handler.c
+++ b/lustre/fld/fld_handler.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -256,12 +256,12 @@ int fld_server_lookup(const struct lu_env *env, struct lu_server_fld *fld,
        if (index == 0 && rc == LDD_F_SV_TYPE_MDT) {
                /* On server side, all entries should be in cache.
                 * If we can not find it in cache, just return error */
-               CERROR("%s: Cannot find sequence "LPX64": rc = %d\n",
+               CERROR("%s: Cannot find sequence %#llx: rc = %d\n",
                       fld->lsf_name, seq, -ENOENT);
                RETURN(-ENOENT);
        } else {
                if (fld->lsf_control_exp == NULL) {
-                       CERROR("%s: lookup "LPX64", but not connects to MDT0"
+                       CERROR("%s: lookup %#llx, but not connects to MDT0"
                               "yet: rc = %d.\n", fld->lsf_name, seq, -EIO);
                        RETURN(-EIO);
                }
@@ -392,11 +392,10 @@ int fid_is_local(const struct lu_env *env,
        }
        return result;
 }
-EXPORT_SYMBOL(fid_is_local);
 
 static void fld_server_proc_fini(struct lu_server_fld *fld);
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 static int fld_server_proc_init(struct lu_server_fld *fld)
 {
         int rc = 0;
@@ -473,7 +472,9 @@ int fld_server_init(const struct lu_env *env, struct lu_server_fld *fld,
                GOTO(out_index, rc);
 
        fld->lsf_control_exp = NULL;
+       fld->lsf_seq_lookup = fld_server_lookup;
 
+       fld->lsf_seq_lookup = fld_server_lookup;
        RETURN(0);
 out_index:
        fld_index_fini(env, fld);