LU-1346 libcfs: tcpip/time/type related cleanup

[fs/lustre-release.git] / lustre / ofd / ofd_internal.h

diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
index 29c9208..5d1b880 100644 (file)
--- a/lustre/ofd/ofd_internal.h
+++ b/lustre/ofd/ofd_internal.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 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/
@@ -40,6 +40,7 @@
 #include <obd.h>
 #include <obd_class.h>
 #include <dt_object.h>
+#include <md_object.h>
 #include <lustre_fid.h>
 #include <obd_ost.h>
 #include <lustre_capa.h>
@@ -69,7 +70,7 @@ struct ofd_mod_data {
 };
 
 #define OFD_FMD_MAX_NUM_DEFAULT 128
-#define OFD_FMD_MAX_AGE_DEFAULT ((obd_timeout + 10) * CFS_HZ)
+#define OFD_FMD_MAX_AGE_DEFAULT ((obd_timeout + 10) * HZ)
 
 enum {
        LPROC_OFD_READ_BYTES = 0,
@@ -107,7 +108,7 @@ static inline void ofd_counter_incr(struct obd_export *exp, int opcode,
 
 struct ofd_seq {
        cfs_list_t              os_list;
-       struct  ost_id          os_oi;
+       struct ost_id           os_oi;
        spinlock_t              os_last_oid_lock;
        struct mutex            os_create_lock;
        cfs_atomic_t            os_refc;
@@ -115,9 +116,6 @@ struct ofd_seq {
        unsigned long           os_destroys_in_progress:1;
 };
 
-#define os_seq         os_oi.oi_seq
-#define os_last_oid    os_oi.oi_id
-
 struct ofd_device {
        struct dt_device         ofd_dt_dev;
        struct dt_device        *ofd_osd;
@@ -304,7 +302,6 @@ struct ofd_thread_info {
        struct lu_attr                   fti_attr2;
        struct ldlm_res_id               fti_resid;
        struct filter_fid                fti_mds_fid;
-       struct filter_fid                fti_mds_fid2;
        struct ost_id                    fti_ostid;
        struct ofd_object               *fti_obj;
        union {
@@ -385,15 +382,12 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
 /* lproc_ofd.c */
 #ifdef LPROCFS
 void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars);
-int lproc_ofd_attach_seqstat(struct obd_device *dev);
-extern struct file_operations ofd_per_nid_stats_fops;
 void ofd_stats_counter_init(struct lprocfs_stats *stats);
 #else
 static void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars)
 {
        memset(lvars, 0, sizeof(*lvars));
 }
-static inline int lproc_ofd_attach_seqstat(struct obd_device *dev) {}
 static inline void ofd_stats_counter_init(struct lprocfs_stats *stats) {}
 #endif
 
@@ -446,7 +440,7 @@ static inline int ofd_grant_compat(struct obd_export *exp,
                                   struct ofd_device *ofd)
 {
        /* Clients which don't support OBD_CONNECT_GRANT_PARAM cannot handle
-        * a block size > page size and consume CFS_PAGE_SIZE of grant when
+        * a block size > page size and consume PAGE_CACHE_SIZE of grant when
         * dirtying a page regardless of the block size */
        return !!(ofd_obd(ofd)->obd_self_export != exp &&
                  ofd->ofd_blockbits > COMPAT_BSIZE_SHIFT &&
@@ -459,13 +453,13 @@ static inline int ofd_grant_prohibit(struct obd_export *exp,
        /* When ofd_grant_compat_disable is set, we don't grant any space to
         * clients not supporting OBD_CONNECT_GRANT_PARAM.
         * Otherwise, space granted to such a client is inflated since it
-        * consumes CFS_PAGE_SIZE of grant space per block */
+        * consumes PAGE_CACHE_SIZE of grant space per block */
        return !!(ofd_grant_compat(exp, ofd) && ofd->ofd_grant_compat_disable);
 }
 
 void ofd_grant_sanity_check(struct obd_device *obd, const char *func);
 long ofd_grant_connect(const struct lu_env *env, struct obd_export *exp,
-                      obd_size want);
+                      obd_size want, bool conservative);
 void ofd_grant_discard(struct obd_export *exp);
 void ofd_grant_prepare_read(const struct lu_env *env, struct obd_export *exp,
                            struct obdo *oa);
@@ -535,34 +529,6 @@ static inline struct ofd_thread_info * ofd_info_init(const struct lu_env *env,
        return info;
 }
 
-/* The same as osc_build_res_name() */
-static inline void ofd_build_resid(const struct lu_fid *fid,
-                                  struct ldlm_res_id *resname)
-{
-       struct ost_id oid;
-
-       if (fid_is_idif(fid)) {
-               oid.oi_id = fid_idif_id(fid_seq(fid), fid_oid(fid),
-                                       fid_ver(fid));
-               oid.oi_seq = FID_SEQ_OST_MDT0;
-       } else {
-               oid.oi_id = fid_oid(fid);
-               oid.oi_seq = fid_seq(fid);
-       }
-       ostid_build_res_name(&oid, resname);
-}
-
-static inline void ofd_fid_from_resid(struct lu_fid *fid,
-                                     const struct ldlm_res_id *name)
-{
-       /* To keep compatiblity, res[0] = oi_id, res[1] = oi_seq. */
-       struct ost_id ostid;
-
-       ostid.oi_id = name->name[LUSTRE_RES_ID_SEQ_OFF];
-       ostid.oi_seq = name->name[LUSTRE_RES_ID_VER_OID_OFF];
-       fid_ostid_unpack(fid, &ostid, 0);
-}
-
 static inline void ofd_oti2info(struct ofd_thread_info *info,
                                struct obd_trans_info *oti)
 {
@@ -597,7 +563,7 @@ static inline void ofd_slc_set(struct ofd_device *ofd)
 static inline void ofd_prepare_fidea(struct filter_fid *ff, struct obdo *oa)
 {
        if (!(oa->o_valid & OBD_MD_FLGROUP))
-               oa->o_seq = 0;
+               ostid_set_seq_mdt0(&oa->o_oi);
        /* packing fid and converting it to LE for storing into EA.
         * Here ->o_stripe_idx should be filled by LOV and rest of
         * fields - by client. */
@@ -606,8 +572,6 @@ static inline void ofd_prepare_fidea(struct filter_fid *ff, struct obdo *oa)
        /* XXX: we are ignoring o_parent_ver here, since this should
         *      be the same for all objects in this fileset. */
        ff->ff_parent.f_ver = cpu_to_le32(oa->o_stripe_idx);
-       ff->ff_objid = cpu_to_le64(oa->o_id);
-       ff->ff_seq = cpu_to_le64(oa->o_seq);
 }
 
 /* niobuf_remote has no rnb_ prefix in master */