X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_fld.h;h=09bcc8a7f86527bfe983713cf19c78d1c7209be5;hb=7d1927ec6e3298c76ff90b4c622f58d6d033ba9b;hp=571ec4560c5bd6274dd656849e69297eff1f9bcd;hpb=f95393b0d0a59cf3dc2f29cffc35dcc4cc9d7728;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index 571ec45..09bcc8a 100644
--- a/lustre/include/lustre_fld.h
+++ b/lustre/include/lustre_fld.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -92,11 +92,12 @@ struct lu_server_fld {
 
         /**
          * Protect index modifications */
-        cfs_mutex_t              lsf_lock;
+	struct mutex		lsf_lock;
 
         /**
          * Fld service name in form "fld-srv-lustre-MDTXXX" */
         char                     lsf_name[80];
+
 };
 
 struct lu_client_fld {
@@ -118,7 +119,7 @@ struct lu_client_fld {
 
         /**
          * Lock protecting exports list and fld_hash. */
-        cfs_spinlock_t           lcf_lock;
+	spinlock_t		 lcf_lock;
 
         /**
          * Client FLD cache. */
@@ -146,27 +147,23 @@ enum {
 int fld_query(struct com_thread_info *info);
 
 /* Server methods */
-int fld_server_init(struct lu_server_fld *fld,
-                    struct dt_device *dt,
-                    const char *prefix,
-                    const struct lu_env *env,
-                    int mds_node_id);
+int fld_server_init(const struct lu_env *env, struct lu_server_fld *fld,
+		    struct dt_device *dt, const char *prefix, int mds_node_id);
 
-void fld_server_fini(struct lu_server_fld *fld,
-                     const struct lu_env *env);
+void fld_server_fini(const struct lu_env *env, struct lu_server_fld *fld);
 
-int fld_server_create(struct lu_server_fld *fld,
-                      const struct lu_env *env,
-                      struct lu_seq_range *add_range,
-                      struct thandle *th);
+int fld_declare_server_create(const struct lu_env *env,
+			      struct lu_server_fld *fld,
+			      struct lu_seq_range *new,
+			      struct thandle *th);
 
-int fld_server_delete(struct lu_server_fld *fld,
-                      const struct lu_env *env,
-                      struct lu_seq_range *range);
+int fld_server_create(const struct lu_env *env,
+		      struct lu_server_fld *fld,
+		      struct lu_seq_range *add_range,
+		      struct thandle *th);
 
-int fld_server_lookup(struct lu_server_fld *fld,
-                      const struct lu_env *env,
-                      seqno_t seq, struct lu_seq_range *range);
+int fld_server_lookup(const struct lu_env *env, struct lu_server_fld *fld,
+		      seqno_t seq, struct lu_seq_range *range);
 
 /* Client methods */
 int fld_client_init(struct lu_client_fld *fld,
@@ -176,9 +173,8 @@ void fld_client_fini(struct lu_client_fld *fld);
 
 void fld_client_flush(struct lu_client_fld *fld);
 
-int fld_client_lookup(struct lu_client_fld *fld,
-                      seqno_t seq, mdsno_t *mds,
-                      const struct lu_env *env);
+int fld_client_lookup(struct lu_client_fld *fld, seqno_t seq, mdsno_t *mds,
+                      __u32 flags, const struct lu_env *env);
 
 int fld_client_create(struct lu_client_fld *fld,
                       struct lu_seq_range *range,
@@ -194,6 +190,8 @@ int fld_client_add_target(struct lu_client_fld *fld,
 int fld_client_del_target(struct lu_client_fld *fld,
                           __u64 idx);
 
+void fld_client_proc_fini(struct lu_client_fld *fld);
+
 /** @} fld */
 
 #endif