LU-3314 scrub: use special fixed FID for .lustre

[fs/lustre-release.git] / lustre / osp / osp_internal.h

diff --git a/lustre/osp/osp_internal.h b/lustre/osp/osp_internal.h
index 75821a5..1658e58 100644 (file)
--- a/lustre/osp/osp_internal.h
+++ b/lustre/osp/osp_internal.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -68,6 +68,10 @@ struct osp_device {
        struct dt_device                 opd_dt_dev;
        /* corresponded OST index */
        int                              opd_index;
+
+       /* corrsponded MDT index, which will be used when connecting to OST
+        * for validating the connection (see ofd_parse_connect_data) */
+       int                              opd_group;
        /* device used to store persistent state (llogs, last ids) */
        struct obd_export               *opd_storage_exp;
        struct dt_device                *opd_storage;
@@ -93,7 +97,7 @@ struct osp_device {
        int                              opd_got_disconnected;
        int                              opd_imp_connected;
        int                              opd_imp_active;
-       int                              opd_imp_seen_connected:1,
+       unsigned int                     opd_imp_seen_connected:1,
                                         opd_connect_mdt:1;
 
        /* whether local recovery is completed:
@@ -182,7 +186,7 @@ extern cfs_mem_cache_t *osp_object_kmem;
 struct osp_object {
        struct lu_object_header opo_header;
        struct dt_object        opo_obj;
-       int                     opo_reserved:1,
+       unsigned int            opo_reserved:1,
                                opo_new:1,
                                opo_empty:1;
 
@@ -194,7 +198,6 @@ struct osp_object {
 extern struct lu_object_operations osp_lu_obj_ops;
 extern const struct dt_device_operations osp_dt_ops;
 extern struct dt_object_operations osp_md_obj_ops;
-extern struct dt_lock_operations osp_md_lock_ops;
 
 struct osp_thread_info {
        struct lu_buf            osi_lb;
@@ -350,8 +353,8 @@ static int osp_fid_end_seq(const struct lu_env *env, struct lu_fid *fid)
                struct osp_thread_info *info = osp_env_info(env);
                struct ost_id *oi = &info->osi_oi;
 
-               fid_ostid_pack(fid, oi);
-               return oi->oi_id == IDIF_MAX_OID;
+               fid_to_ostid(fid, oi);
+               return ostid_id(oi) == IDIF_MAX_OID;
        } else {
                return fid_oid(fid) == LUSTRE_DATA_SEQ_MAX_WIDTH;
        }