LU-2335 kernel: add CONFIG_ prefix to config values

[fs/lustre-release.git] / lustre / osc / osc_cl_internal.h

diff --git a/lustre/osc/osc_cl_internal.h b/lustre/osc/osc_cl_internal.h
index d10d26f..d53c29f 100644 (file)
--- a/lustre/osc/osc_cl_internal.h
+++ b/lustre/osc/osc_cl_internal.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -85,7 +85,7 @@ struct osc_io {
        struct osc_async_cbargs {
                bool              opc_rpc_sent;
                int               opc_rc;
-               cfs_completion_t  opc_sync;
+               struct completion       opc_sync;
        } oi_cbarg;
 };
 
@@ -123,13 +123,13 @@ struct osc_object {
          */
         int                oo_contended;
         cfs_time_t         oo_contention_time;
-#ifdef INVARIANT_CHECK
+#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
         /**
          * IO context used for invariant checks in osc_lock_has_pages().
          */
         struct cl_io       oo_debug_io;
         /** Serialization object for osc_object::oo_debug_io. */
-        cfs_mutex_t        oo_debug_mutex;
+       struct mutex       oo_debug_mutex;
 #endif
         /**
          * List of pages in transfer.
@@ -139,7 +139,7 @@ struct osc_object {
          * Lock, protecting ccc_object::cob_inflight, because a seat-belt is
          * locked during take-off and landing.
          */
-        cfs_spinlock_t     oo_seatbelt;
+       spinlock_t         oo_seatbelt;
 
        /**
         * used by the osc to keep track of what objects to build into rpcs.
@@ -168,27 +168,27 @@ struct osc_object {
 
        /** Protect extent tree. Will be used to protect
         * oo_{read|write}_pages soon. */
-       cfs_spinlock_t       oo_lock;
+       spinlock_t          oo_lock;
 };
 
 static inline void osc_object_lock(struct osc_object *obj)
 {
-       cfs_spin_lock(&obj->oo_lock);
+       spin_lock(&obj->oo_lock);
 }
 
 static inline int osc_object_trylock(struct osc_object *obj)
 {
-       return cfs_spin_trylock(&obj->oo_lock);
+       return spin_trylock(&obj->oo_lock);
 }
 
 static inline void osc_object_unlock(struct osc_object *obj)
 {
-       cfs_spin_unlock(&obj->oo_lock);
+       spin_unlock(&obj->oo_lock);
 }
 
 static inline int osc_object_is_locked(struct osc_object *obj)
 {
-       return cfs_spin_is_locked(&obj->oo_lock);
+       return spin_is_locked(&obj->oo_lock);
 }
 
 /*
@@ -403,7 +403,6 @@ struct osc_page {
         struct cl_lock       *ops_lock;
 };
 
-extern cfs_mem_cache_t *osc_page_kmem;
 extern cfs_mem_cache_t *osc_lock_kmem;
 extern cfs_mem_cache_t *osc_object_kmem;
 extern cfs_mem_cache_t *osc_thread_kmem;
@@ -427,12 +426,9 @@ int osc_req_init (const struct lu_env *env, struct cl_device *dev,
 struct lu_object *osc_object_alloc(const struct lu_env *env,
                                    const struct lu_object_header *hdr,
                                    struct lu_device *dev);
-struct cl_page   *osc_page_init   (const struct lu_env *env,
-                                   struct cl_object *obj,
-                                   struct cl_page *page, cfs_page_t *vmpage);
+int osc_page_init(const struct lu_env *env, struct cl_object *obj,
+                 struct cl_page *page, cfs_page_t *vmpage);
 
-void osc_lock_build_res(const struct lu_env *env, const struct osc_object *obj,
-                        struct ldlm_res_id *resname);
 void osc_index2policy  (ldlm_policy_data_t *policy, const struct cl_object *obj,
                         pgoff_t start, pgoff_t end);
 int  osc_lvb_print     (const struct lu_env *env, void *cookie,
@@ -600,8 +596,6 @@ enum osc_extent_state {
        OES_TRUNC     = 6, /** being truncated */
        OES_STATE_MAX
 };
-#define OES_STRINGS { "inv", "active", "cache", "locking", "lockdone", "rpc", \
-                     "trunc", NULL }
 
 /**
  * osc_extent data to manage dirty pages.