X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_cl_internal.h;h=724a70a3ef4921bea4b9bf6a2bd3ef22928fe6fa;hb=12e311012ae337276dc3e7da3e7ad8d85d11e764;hp=08082da1f64081cf5729dd1a88108128d2160aa7;hpb=342c14842fa996181e5d5764701585b1b2f6d6cb;p=fs%2Flustre-release.git

diff --git a/lustre/osc/osc_cl_internal.h b/lustre/osc/osc_cl_internal.h
index 08082da..724a70a 100644
--- a/lustre/osc/osc_cl_internal.h
+++ b/lustre/osc/osc_cl_internal.h
@@ -46,15 +46,9 @@
 #ifndef OSC_CL_INTERNAL_H
 #define OSC_CL_INTERNAL_H
 
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-#else
-# include <liblustre.h>
-#endif
-
+#include <libcfs/libcfs.h>
 #include <obd.h>
 /* osc_build_res_name() */
-#include <obd_ost.h>
 #include <cl_object.h>
 #include <lclient.h>
 #include "osc_internal.h"
@@ -141,21 +135,21 @@ struct osc_object {
         /**
          * List of pages in transfer.
          */
-        cfs_list_t         oo_inflight[CRT_NR];
+	struct list_head	oo_inflight[CRT_NR];
         /**
          * Lock, protecting ccc_object::cob_inflight, because a seat-belt is
          * locked during take-off and landing.
          */
-	spinlock_t	   oo_seatbelt;
+	spinlock_t		oo_seatbelt;
 
 	/**
 	 * used by the osc to keep track of what objects to build into rpcs.
 	 * Protected by client_obd->cli_loi_list_lock.
 	 */
-	cfs_list_t	   oo_ready_item;
-	cfs_list_t	   oo_hp_ready_item;
-	cfs_list_t	   oo_write_item;
-	cfs_list_t	   oo_read_item;
+	struct list_head	oo_ready_item;
+	struct list_head	oo_hp_ready_item;
+	struct list_head	oo_write_item;
+	struct list_head	oo_read_item;
 
 	/**
 	 * extent is a red black tree to manage (async) dirty pages.
@@ -164,11 +158,11 @@ struct osc_object {
 	/**
 	 * Manage write(dirty) extents.
 	 */
-	cfs_list_t	   oo_hp_exts; /* list of hp extents */
-	cfs_list_t	   oo_urgent_exts; /* list of writeback extents */
-	cfs_list_t	   oo_rpc_exts;
+	struct list_head	oo_hp_exts;	/* list of hp extents */
+	struct list_head	oo_urgent_exts;	/* list of writeback extents */
+	struct list_head	oo_rpc_exts;
 
-	cfs_list_t	   oo_reading_exts;
+	struct list_head	oo_reading_exts;
 
 	atomic_t	 oo_nr_reads;
 	atomic_t	 oo_nr_writes;
@@ -202,7 +196,16 @@ static inline void osc_object_unlock(struct osc_object *obj)
 
 static inline int osc_object_is_locked(struct osc_object *obj)
 {
+#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
 	return spin_is_locked(&obj->oo_lock);
+#else
+	/*
+	 * It is not perfect to return true all the time.
+	 * But since this function is only used for assertion
+	 * and checking, it seems OK.
+	 */
+	return 1;
+#endif
 }
 
 /*
@@ -378,12 +381,12 @@ struct osc_page {
 	/**
 	 * lru page list. See osc_lru_{del|use}() in osc_page.c for usage.
 	 */
-	cfs_list_t            ops_lru;
+	struct list_head	ops_lru;
 	/**
 	 * Linkage into a per-osc_object list of pages in flight. For
 	 * debugging.
 	 */
-	cfs_list_t            ops_inflight;
+	struct list_head	ops_inflight;
 	/**
 	 * Thread that submitted this page for transfer. For debugging.
 	 */
@@ -425,7 +428,7 @@ void osc_index2policy  (ldlm_policy_data_t *policy, const struct cl_object *obj,
 int  osc_lvb_print     (const struct lu_env *env, void *cookie,
                         lu_printer_t p, const struct ost_lvb *lvb);
 
-void osc_lru_add_batch(struct client_obd *cli, cfs_list_t *list);
+void osc_lru_add_batch(struct client_obd *cli, struct list_head *list);
 void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
 		     enum cl_req_type crt, int brw_flags);
 int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops);
@@ -442,7 +445,7 @@ int osc_teardown_async_page(const struct lu_env *env, struct osc_object *obj,
 int osc_flush_async_page(const struct lu_env *env, struct cl_io *io,
 			 struct osc_page *ops);
 int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj,
-			 cfs_list_t *list, int cmd, int brw_flags);
+			 struct list_head *list, int cmd, int brw_flags);
 int osc_cache_truncate_start(const struct lu_env *env, struct osc_io *oio,
 			     struct osc_object *obj, __u64 size);
 void osc_cache_truncate_end(const struct lu_env *env, struct osc_io *oio,
@@ -622,7 +625,7 @@ struct osc_extent {
 	/** busy if non-zero */
 	atomic_t		oe_users;
 	/** link list of osc_object's oo_{hp|urgent|locking}_exts. */
-	cfs_list_t		oe_link;
+	struct list_head	oe_link;
 	/** state of this extent */
 	unsigned int		oe_state;
 	/** flags for this extent. */
@@ -652,7 +655,7 @@ struct osc_extent {
 	/** # of dirty pages in this extent */
 	unsigned int		oe_nr_pages;
 	/** list of pending oap pages. Pages in this list are NOT sorted. */
-	cfs_list_t		oe_pages;
+	struct list_head	oe_pages;
 	/** Since an extent has to be written out in atomic, this is used to
 	 * remember the next page need to be locked to write this extent out.
 	 * Not used right now.