* 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/
#include <obd.h>
#include <obd_class.h>
#include <dt_object.h>
+#include <md_object.h>
#include <lustre_fid.h>
/*
/* dedicate precreate thread */
struct ptlrpc_thread opd_pre_thread;
/* thread waits for signals about pool going empty */
- cfs_waitq_t opd_pre_waitq;
+ wait_queue_head_t opd_pre_waitq;
/* consumers (who needs new ids) wait here */
- cfs_waitq_t opd_pre_user_waitq;
+ wait_queue_head_t opd_pre_user_waitq;
/* current precreation status: working, failed, stopping? */
int opd_pre_status;
/* how many to precreate next time */
int opd_syn_prev_done;
/* found records */
struct ptlrpc_thread opd_syn_thread;
- cfs_waitq_t opd_syn_waitq;
+ wait_queue_head_t opd_syn_waitq;
/* list of remotely committed rpc */
cfs_list_t opd_syn_committed_there;
/* number of changes being under sync */
*/
struct obd_statfs opd_statfs;
cfs_time_t opd_statfs_fresh_till;
- cfs_timer_t opd_statfs_timer;
+ struct timer_list opd_statfs_timer;
int opd_statfs_update_in_progress;
/* how often to update statfs data */
int opd_statfs_maxage;
cfs_proc_dir_entry_t *opd_symlink;
};
-extern cfs_mem_cache_t *osp_object_kmem;
+extern struct kmem_cache *osp_object_kmem;
/* this is a top object */
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;
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;
}