* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <dt_object.h>
#include <md_object.h>
#include <lustre_fid.h>
-#include <obd_ost.h>
-#include <lustre_capa.h>
#define OFD_INIT_OBJID 0
-#define OFD_ROCOMPAT_SUPP (0)
-#define OFD_INCOMPAT_SUPP (OBD_INCOMPAT_GROUPS | OBD_INCOMPAT_OST | \
- OBD_INCOMPAT_COMMON_LR)
#define OFD_PRECREATE_BATCH_DEFAULT (OBJ_SUBDIR_COUNT * 4)
/* on small filesystems we should not precreate too many objects in
/* per-client-per-object persistent state (LRU) */
struct ofd_mod_data {
- cfs_list_t fmd_list; /* linked to fed_mod_list */
- struct lu_fid fmd_fid; /* FID being written to */
- __u64 fmd_mactime_xid; /* xid highest {m,a,c}time setattr */
- cfs_time_t fmd_expire; /* time when the fmd should expire */
- int fmd_refcount; /* reference counter - list holds 1 */
+ struct list_head fmd_list; /* linked to fed_mod_list */
+ struct lu_fid fmd_fid; /* FID being written to */
+ __u64 fmd_mactime_xid; /* xid highest {m,a,c}time setattr */
+ cfs_time_t fmd_expire; /* time when the fmd should expire */
+ int fmd_refcount; /* reference counter - list holds 1 */
};
#define OFD_FMD_MAX_NUM_DEFAULT 128
-#define OFD_FMD_MAX_AGE_DEFAULT ((obd_timeout + 10) * HZ)
+#define OFD_FMD_MAX_AGE_DEFAULT msecs_to_jiffies((obd_timeout+10)*MSEC_PER_SEC)
#define OFD_SOFT_SYNC_LIMIT_DEFAULT 16
}
struct ofd_seq {
- cfs_list_t os_list;
+ struct list_head os_list;
struct ost_id os_oi;
spinlock_t os_last_oid_lock;
struct mutex os_create_lock;
__u64 ofd_inconsistency_self_detected;
__u64 ofd_inconsistency_self_repaired;
- cfs_list_t ofd_seq_list;
+ struct list_head ofd_seq_list;
rwlock_t ofd_seq_list_lock;
int ofd_seq_count;
int ofd_precreate_batch;
__u64 ofd_osfs_age;
int ofd_blockbits;
/* writes which might be be accounted twice in ofd_osfs.os_bavail */
- obd_size ofd_osfs_unstable;
+ u64 ofd_osfs_unstable;
/* counters used during statfs update, protected by ofd_osfs_lock.
* record when some statfs refresh are in progress */
int ofd_statfs_inflight;
/* track writes completed while statfs refresh is underway.
* tracking is only effective when ofd_statfs_inflight > 1 */
- obd_size ofd_osfs_inflight;
+ u64 ofd_osfs_inflight;
/* grants: all values in bytes */
/* grant lock to protect all grant counters */
spinlock_t ofd_grant_lock;
/* total amount of dirty data reported by clients in incoming obdo */
- obd_size ofd_tot_dirty;
+ u64 ofd_tot_dirty;
/* sum of filesystem space granted to clients for async writes */
- obd_size ofd_tot_granted;
+ u64 ofd_tot_granted;
/* grant used by I/Os in progress (between prepare and commit) */
- obd_size ofd_tot_pending;
+ u64 ofd_tot_pending;
/* free space threshold over which we stop granting space to clients
* ofd_grant_ratio is stored as a fixed-point fraction using
* OFD_GRANT_RATIO_SHIFT of the remaining free space, not in percentage
return ofd_dev(fo->ofo_obj.do_lu.lo_dev);
}
-static inline struct lustre_capa *ofd_object_capa(const struct lu_env *env,
- const struct ofd_object *obj)
-{
- /* TODO: see mdd_object_capa() */
- return BYPASS_CAPA;
-}
-
static inline void ofd_read_lock(const struct lu_env *env,
struct ofd_object *fo)
{
extern void target_recovery_fini(struct obd_device *obd);
extern void target_recovery_init(struct lu_target *lut, svc_handler_t handler);
-/* ofd_capa.c */
-int ofd_update_capa_key(struct ofd_device *ofd, struct lustre_capa_key *key);
-int ofd_auth_capa(struct obd_export *exp, const struct lu_fid *fid,
- obd_seq seq, struct lustre_capa *capa, __u64 opc);
-void ofd_free_capa_keys(struct ofd_device *ofd);
-
/* ofd_dev.c */
extern struct lu_context_key ofd_thread_key;
int ofd_postrecov(const struct lu_env *env, struct ofd_device *ofd);
int ofd_fiemap_get(const struct lu_env *env, struct ofd_device *ofd,
- struct lu_fid *fid, struct ll_user_fiemap *fiemap);
+ struct lu_fid *fid, struct fiemap *fiemap);
/* ofd_obd.c */
extern struct obd_ops ofd_obd_ops;
int ofd_obd_disconnect(struct obd_export *exp);
/* ofd_fs.c */
-obd_id ofd_seq_last_oid(struct ofd_seq *oseq);
-void ofd_seq_last_oid_set(struct ofd_seq *oseq, obd_id id);
+u64 ofd_seq_last_oid(struct ofd_seq *oseq);
+void ofd_seq_last_oid_set(struct ofd_seq *oseq, u64 id);
int ofd_seq_last_oid_write(const struct lu_env *env, struct ofd_device *ofd,
struct ofd_seq *oseq);
int ofd_seqs_init(const struct lu_env *env, struct ofd_device *ofd);
-struct ofd_seq *ofd_seq_get(struct ofd_device *ofd, obd_seq seq);
+struct ofd_seq *ofd_seq_get(struct ofd_device *ofd, u64 seq);
void ofd_seq_put(const struct lu_env *env, struct ofd_seq *oseq);
int ofd_fs_setup(const struct lu_env *env, struct ofd_device *ofd,
void ofd_fs_cleanup(const struct lu_env *env, struct ofd_device *ofd);
int ofd_precreate_batch(struct ofd_device *ofd, int batch);
struct ofd_seq *ofd_seq_load(const struct lu_env *env, struct ofd_device *ofd,
- obd_seq seq);
+ u64 seq);
void ofd_seqs_fini(const struct lu_env *env, struct ofd_device *ofd);
void ofd_seqs_free(const struct lu_env *env, struct ofd_device *ofd);
int ofd_preprw(const struct lu_env *env,int cmd, struct obd_export *exp,
struct obdo *oa, int objcount, struct obd_ioobj *obj,
struct niobuf_remote *rnb, int *nr_local,
- struct niobuf_local *lnb, struct obd_trans_info *oti,
- struct lustre_capa *capa);
+ struct niobuf_local *lnb);
int ofd_commitrw(const struct lu_env *env, int cmd, struct obd_export *exp,
struct obdo *oa, int objcount, struct obd_ioobj *obj,
struct niobuf_remote *rnb, int npages,
- struct niobuf_local *lnb, struct obd_trans_info *oti,
- int old_rc);
+ struct niobuf_local *lnb, int old_rc);
/* ofd_trans.c */
struct thandle *ofd_trans_create(const struct lu_env *env,
void *cookie);
/* lproc_ofd.c */
-#ifdef LPROCFS
-void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars);
+#ifdef CONFIG_PROC_FS
+extern struct lprocfs_vars lprocfs_ofd_obd_vars[];
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 void ofd_stats_counter_init(struct lprocfs_stats *stats) {}
#endif
struct ofd_object *ofd_object_find(const struct lu_env *env,
struct ofd_device *ofd,
const struct lu_fid *fid);
-struct ofd_object *ofd_object_find_or_create(const struct lu_env *env,
- struct ofd_device *ofd,
- const struct lu_fid *fid,
- struct lu_attr *attr);
int ofd_object_ff_load(const struct lu_env *env, struct ofd_object *fo);
int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
- obd_id id, struct ofd_seq *oseq, int nr, int sync);
+ u64 id, struct ofd_seq *oseq, int nr, int sync);
void ofd_object_put(const struct lu_env *env, struct ofd_object *fo);
int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo,
/* ofd_grants.c */
#define OFD_GRANT_RATIO_SHIFT 8
-static inline __u64 ofd_grant_reserved(struct ofd_device *ofd, obd_size bavail)
+static inline u64 ofd_grant_reserved(struct ofd_device *ofd, u64 bavail)
{
return (bavail * ofd->ofd_grant_ratio) >> OFD_GRANT_RATIO_SHIFT;
}
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, bool conservative);
+ u64 want, bool new_conn);
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);
return info;
}
-static inline void ofd_oti2info(struct ofd_thread_info *info,
- struct obd_trans_info *oti)
-{
- info->fti_xid = oti->oti_xid;
- info->fti_pre_version = oti->oti_pre_version;
-}
-
-static inline void ofd_info2oti(struct ofd_thread_info *info,
- struct obd_trans_info *oti)
-{
- oti->oti_xid = info->fti_xid;
- oti->oti_pre_version = info->fti_pre_version;
-}
-
/* sync on lock cancel is useless when we force a journal flush,
* and if we enable async journal commit, we should also turn on
* sync on lock cancel if it is not enabled already. */
ff->ff_parent.f_ver = cpu_to_le32(oa->o_stripe_idx);
}
-/* niobuf_remote has no rnb_ prefix in master */
-#define rnb_offset offset
-#define rnb_flags flags
-#define rnb_len len
-/* the same for niobuf_local */
-#define lnb_flags flags
-#define lnb_rc rc
-
#endif /* _OFD_INTERNAL_H */