X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffid%2Ffid_store.c;h=5ae830760b17731fd4cc3fdcf5444aa117c5c80b;hb=1cd0fdde12df0332b043fc92839b3bd94c6213e1;hp=13a09332941977d3f54517266ad4165e1fd463f1;hpb=fedede83f52b3e398b47fbb4d22c62c61a491238;p=fs%2Flustre-release.git

diff --git a/lustre/fid/fid_store.c b/lustre/fid/fid_store.c
index 13a0933..5ae8307 100644
--- a/lustre/fid/fid_store.c
+++ b/lustre/fid/fid_store.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, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,24 +42,15 @@
 
 #define DEBUG_SUBSYSTEM S_FID
 
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-# include <linux/module.h>
-#else /* __KERNEL__ */
-# include <liblustre.h>
-#endif
-
-#include <obd.h>
-#include <obd_class.h>
+#include <libcfs/libcfs.h>
 #include <dt_object.h>
 #include <md_object.h>
 #include <obd_support.h>
-#include <lustre_req_layout.h>
+#include <lustre_capa.h>
 #include <lustre_fid.h>
+#include <lustre_fld.h>
 #include "fid_internal.h"
 
-#ifdef __KERNEL__
-
 static struct lu_buf *seq_store_buf(struct seq_thread_info *info)
 {
         struct lu_buf *buf;
@@ -137,7 +128,7 @@ int seq_store_update(const struct lu_env *env, struct lu_server_seq *seq,
 
 	if (out != NULL) {
 		rc = fld_declare_server_create(env,
-					       seq->lss_site->ms_server_fld,
+					       seq->lss_site->ss_server_fld,
 					       out, th);
 		if (rc)
 			GOTO(exit, rc);
@@ -156,7 +147,7 @@ int seq_store_update(const struct lu_env *env, struct lu_server_seq *seq,
 		       seq->lss_name, rc);
 		GOTO(exit, rc);
 	} else if (out != NULL) {
-		rc = fld_server_create(env, seq->lss_site->ms_server_fld, out,
+		rc = fld_server_create(env, seq->lss_site->ss_server_fld, out,
 				       th);
 		if (rc) {
 			CERROR("%s: Can't Update fld database, rc %d\n",
@@ -262,4 +253,3 @@ void seq_store_fini(struct lu_server_seq *seq,
 
         EXIT;
 }
-#endif