LU-2139 osc: Use SOFT_SYNC to urge server commit

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

diff --git a/lustre/osc/osc_internal.h b/lustre/osc/osc_internal.h
index 99c30cc..40279d4 100644 (file)
--- a/lustre/osc/osc_internal.h
+++ b/lustre/osc/osc_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) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -69,8 +69,8 @@ struct osc_async_page {
         struct client_obd       *oap_cli;
        struct osc_object       *oap_obj;
 
-        struct ldlm_lock        *oap_ldlm_lock;
-        cfs_spinlock_t           oap_lock;
+       struct ldlm_lock        *oap_ldlm_lock;
+       spinlock_t               oap_lock;
 };
 
 #define oap_page        oap_brw_page.pg
@@ -78,34 +78,20 @@ struct osc_async_page {
 #define oap_brw_flags   oap_brw_page.flag
 
 struct osc_cache_waiter {
-        cfs_list_t              ocw_entry;
-        cfs_waitq_t             ocw_waitq;
-        struct osc_async_page  *ocw_oap;
+       cfs_list_t              ocw_entry;
+       wait_queue_head_t             ocw_waitq;
+       struct osc_async_page  *ocw_oap;
        int                     ocw_grant;
-        int                     ocw_rc;
+       int                     ocw_rc;
 };
 
-#define OSCC_FLAG_RECOVERING         0x01
-#define OSCC_FLAG_CREATING           0x02
-#define OSCC_FLAG_NOSPC              0x04 /* can't create more objects on OST */
-#define OSCC_FLAG_SYNC_IN_PROGRESS   0x08 /* only allow one thread to sync */
-#define OSCC_FLAG_LOW                0x10
-#define OSCC_FLAG_EXITING            0x20
-#define OSCC_FLAG_DEGRADED           0x40
-#define OSCC_FLAG_RDONLY             0x80
-#define OSCC_FLAG_NOSPC_BLK          0x100 /* no more block space on OST */
-
-int osc_precreate(struct obd_export *exp);
 int osc_create(const struct lu_env *env, struct obd_export *exp,
                struct obdo *oa, struct lov_stripe_md **ea,
                struct obd_trans_info *oti);
-int osc_create_async(struct obd_export *exp, struct obd_info *oinfo,
-                     struct lov_stripe_md **ea, struct obd_trans_info *oti);
 int osc_real_create(struct obd_export *exp, struct obdo *oa,
                     struct lov_stripe_md **ea, struct obd_trans_info *oti);
-void oscc_init(struct obd_device *obd);
 void osc_wake_cache_waiters(struct client_obd *cli);
-int osc_shrink_grant_to_target(struct client_obd *cli, long target);
+int osc_shrink_grant_to_target(struct client_obd *cli, __u64 target_bytes);
 void osc_update_next_shrink(struct client_obd *cli);
 
 /*
@@ -116,7 +102,7 @@ void osc_update_next_shrink(struct client_obd *cli);
 extern struct ptlrpc_request_set *PTLRPCD_SET;
 
 int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,
-                     int *flags, ldlm_policy_data_t *policy,
+                    __u64 *flags, ldlm_policy_data_t *policy,
                      struct ost_lvb *lvb, int kms_valid,
                      obd_enqueue_update_f upcall,
                      void *cookie, struct ldlm_enqueue_info *einfo,
@@ -125,9 +111,9 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,
 int osc_cancel_base(struct lustre_handle *lockh, __u32 mode);
 
 int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id,
-                   __u32 type, ldlm_policy_data_t *policy, __u32 mode,
-                   int *flags, void *data, struct lustre_handle *lockh,
-                   int unref);
+                  __u32 type, ldlm_policy_data_t *policy, __u32 mode,
+                  __u64 *flags, void *data, struct lustre_handle *lockh,
+                  int unref);
 
 int osc_setattr_async_base(struct obd_export *exp, struct obd_info *oinfo,
                            struct obd_trans_info *oti,
@@ -145,7 +131,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
                  cfs_list_t *ext_list, int cmd, pdl_policy_t p);
 int osc_lru_shrink(struct client_obd *cli, int target);
 
-extern cfs_spinlock_t osc_ast_guard;
+extern spinlock_t osc_ast_guard;
 
 int osc_cleanup(struct obd_device *obd);
 int osc_setup(struct obd_device *obd, struct lustre_cfg *lcfg);
@@ -202,7 +188,7 @@ static inline struct osc_device *obd2osc_dev(const struct obd_device *d)
 
 int osc_dlm_lock_pageref(struct ldlm_lock *dlm);
 
-extern cfs_mem_cache_t *osc_quota_kmem;
+extern struct kmem_cache *osc_quota_kmem;
 struct osc_quota_info {
         /** linkage for quota hash table */
         cfs_hlist_node_t oqi_hash;
@@ -218,4 +204,8 @@ int osc_quotactl(struct obd_device *unused, struct obd_export *exp,
 int osc_quotacheck(struct obd_device *unused, struct obd_export *exp,
                    struct obd_quotactl *oqctl);
 int osc_quota_poll_check(struct obd_export *exp, struct if_quotacheck *qchk);
+
+void osc_inc_unstable_pages(struct ptlrpc_request *req);
+void osc_dec_unstable_pages(struct ptlrpc_request *req);
+int  osc_over_unstable_soft_limit(struct client_obd *cli);
 #endif /* OSC_INTERNAL_H */