Branch HEAD

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

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index 119469c..9ef5cce 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -523,18 +523,11 @@ struct mds_obd {
         struct obd_export               *mds_osc_exp; /* XXX lov_exp */
         struct lov_desc                  mds_lov_desc;
         __u32                            mds_id;
-
-        struct file                     *mds_lov_objid_filp;
-        /* protect update vs free in lov_add_target */
-        struct rw_semaphore              mds_lov_objids_sem;
-        /* protect update vs update or memmove vs update */
-        spinlock_t                       mds_lov_objids_lock;
-        /* wait for safe free */
-        cfs_waitq_t                      mds_lov_objids_wait;
         obd_id                          *mds_lov_objids;
-        __u32                            mds_lov_objids_count;
+        int                              mds_lov_objids_size;
+        __u32                            mds_lov_objids_in_file;
         int                              mds_lov_nextid_set;
-
+        struct file                     *mds_lov_objid_filp;
         struct file                     *mds_health_check_filp;
         unsigned long                   *mds_client_bitmap;
 //        struct upcall_cache             *mds_group_hash;
@@ -560,8 +553,6 @@ struct mds_obd {
         struct lustre_capa_key          *mds_capa_keys;
 };
 
-#define mds_lov_objids_size(mds)        ((mds)->mds_lov_objids_count*sizeof(obd_id))
-
 struct echo_obd {
         struct obdo          eo_oa;
         spinlock_t           eo_lock;
@@ -1311,9 +1302,10 @@ struct md_ops {
                                         struct obd_client_handle *);
         int (*m_set_lock_data)(struct obd_export *, __u64 *, void *);
 
-        int (*m_lock_match)(struct obd_export *, int, const struct lu_fid *,
-                            ldlm_type_t, ldlm_policy_data_t *, ldlm_mode_t,
-                            struct lustre_handle *);
+        ldlm_mode_t (*m_lock_match)(struct obd_export *, int,
+                                    const struct lu_fid *, ldlm_type_t,
+                                    ldlm_policy_data_t *, ldlm_mode_t,
+                                    struct lustre_handle *);
 
         int (*m_cancel_unused)(struct obd_export *, const struct lu_fid *,
                                ldlm_policy_data_t *, ldlm_mode_t, int flags,