b=19486 add server identifier into lu_seq_range.

[fs/lustre-release.git] / lustre / include / lustre_fld.h

diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index ec65b99..428b352 100644 (file)
--- a/lustre/include/lustre_fld.h
+++ b/lustre/include/lustre_fld.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -37,6 +37,11 @@
 #ifndef __LINUX_FLD_H
 #define __LINUX_FLD_H
 
+/** \defgroup fld fld
+ *
+ * @{
+ */
+
 #include <lustre/lustre_idl.h>
 #include <lustre_mdt.h>
 #include <dt_object.h>
@@ -61,7 +66,7 @@ enum {
 
 
 struct lu_fld_target {
-        struct list_head         ft_chain;
+        cfs_list_t               ft_chain;
         struct obd_export       *ft_exp;
         struct lu_server_fld    *ft_srv;
         __u64                    ft_idx;
@@ -87,7 +92,7 @@ struct lu_server_fld {
 
         /**
          * Protect index modifications */
-        struct mutex            lsf_lock;
+        cfs_mutex_t              lsf_lock;
 
         /**
          * Fld service name in form "fld-srv-lustre-MDTXXX" */
@@ -101,7 +106,7 @@ struct lu_client_fld {
 
         /**
          * List of exports client FLD knows about. */
-        struct list_head         lcf_targets;
+        cfs_list_t               lcf_targets;
 
         /**
          * Current hash to be used to chose an export. */
@@ -113,7 +118,7 @@ struct lu_client_fld {
 
         /**
          * Lock protecting exports list and fld_hash. */
-        spinlock_t               lcf_lock;
+        cfs_spinlock_t           lcf_lock;
 
         /**
          * Client FLD cache. */
@@ -171,9 +176,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,
@@ -189,4 +193,6 @@ int fld_client_add_target(struct lu_client_fld *fld,
 int fld_client_del_target(struct lu_client_fld *fld,
                           __u64 idx);
 
+/** @} fld */
+
 #endif