b=23289 cleanup assertion on atomic

[fs/lustre-release.git] / lustre / include / obd_class.h

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 611c6e4..fb6f702 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -103,6 +103,12 @@ void obd_zombie_impexp_stop(void);
 void obd_zombie_impexp_cull(void);
 void obd_zombie_barrier(void);
 void obd_exports_barrier(struct obd_device *obd);
+int kuc_len(int payload_len);
+struct kuc_hdr * kuc_ptr(void *p);
+int kuc_ispayload(void *p);
+void *kuc_alloc(int payload_len, int transport, int type);
+void kuc_free(void *p, int payload_len);
+
 /* obd_config.c */
 int class_process_config(struct lustre_cfg *lcfg);
 int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars,
@@ -156,6 +162,7 @@ struct config_llog_data {
         cfs_atomic_t                cld_refcount;
         struct config_llog_data    *cld_sptlrpc;/* depended sptlrpc log */
         struct obd_export          *cld_mgcexp;
+        cfs_mutex_t                 cld_lock;
         unsigned int                cld_stopping:1, /* we were told to stop
                                                      * watching */
                                     cld_lostlock:1, /* lock not requeued */
@@ -196,7 +203,7 @@ extern void (*class_export_dump_hook)(struct obd_export *);
 
 #define class_export_rpc_put(exp)                                       \
 ({                                                                      \
-        LASSERT(cfs_atomic_read(&exp->exp_rpc_count) > 0);              \
+        LASSERT_ATOMIC_POS(&exp->exp_rpc_count);                        \
         cfs_atomic_dec(&(exp)->exp_rpc_count);                          \
         CDEBUG(D_INFO, "RPC PUTting export %p : new rpc_count %d\n",    \
                (exp), cfs_atomic_read(&(exp)->exp_rpc_count));          \
@@ -214,7 +221,7 @@ extern void (*class_export_dump_hook)(struct obd_export *);
 
 #define class_export_lock_put(exp, lock)                                \
 ({                                                                      \
-        LASSERT(cfs_atomic_read(&exp->exp_locks_count) > 0);            \
+        LASSERT_ATOMIC_POS(&exp->exp_locks_count);                      \
         cfs_atomic_dec(&(exp)->exp_locks_count);                        \
         __class_export_del_lock_ref(exp, lock);                         \
         CDEBUG(D_INFO, "lock PUTting export %p : new locks_count %d\n", \
@@ -232,7 +239,7 @@ extern void (*class_export_dump_hook)(struct obd_export *);
 
 #define class_export_cb_put(exp)                                        \
 ({                                                                      \
-        LASSERT(cfs_atomic_read(&exp->exp_cb_count) > 0);               \
+        LASSERT_ATOMIC_POS(&exp->exp_cb_count);                         \
         cfs_atomic_dec(&(exp)->exp_cb_count);                           \
         CDEBUG(D_INFO, "callback PUTting export %p : new cb_count %d\n",\
                (exp), cfs_atomic_read(&(exp)->exp_cb_count));           \
@@ -381,7 +388,8 @@ do {                                                            \
 #define EXP_MD_COUNTER_INCREMENT(exp, op)
 #endif
 
-static inline int lprocfs_nid_ldlm_stats_init(struct nid_stat* tmp) {
+static inline int lprocfs_nid_ldlm_stats_init(struct nid_stat* tmp)
+{
         /* Always add in ldlm_stats */
         tmp->nid_ldlm_stats = lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC
                                                   ,LPROCFS_STATS_FLAG_NOPERCPU);
@@ -1625,7 +1633,8 @@ static inline int obd_quotactl(struct obd_export *exp,
 
 static inline int obd_quota_adjust_qunit(struct obd_export *exp,
                                          struct quota_adjust_qunit *oqaq,
-                                         struct lustre_quota_ctxt *qctxt)
+                                         struct lustre_quota_ctxt *qctxt,
+                                         struct ptlrpc_request_set *set)
 {
 #if defined(LPROCFS) && defined(HAVE_QUOTA_SUPPORT)
         struct timeval work_start;
@@ -1642,7 +1651,7 @@ static inline int obd_quota_adjust_qunit(struct obd_export *exp,
         EXP_CHECK_DT_OP(exp, quota_adjust_qunit);
         EXP_COUNTER_INCREMENT(exp, quota_adjust_qunit);
 
-        rc = OBP(exp->exp_obd, quota_adjust_qunit)(exp, oqaq, qctxt);
+        rc = OBP(exp->exp_obd, quota_adjust_qunit)(exp, oqaq, qctxt, set);
 
 #if defined(LPROCFS) && defined(HAVE_QUOTA_SUPPORT)
         if (qctxt) {
@@ -2162,13 +2171,13 @@ static inline int md_intent_getattr_async(struct obd_export *exp,
 
 static inline int md_revalidate_lock(struct obd_export *exp,
                                      struct lookup_intent *it,
-                                     struct lu_fid *fid, __u32 *bits)
+                                     struct lu_fid *fid)
 {
         int rc;
         ENTRY;
         EXP_CHECK_MD_OP(exp, revalidate_lock);
         EXP_MD_COUNTER_INCREMENT(exp, revalidate_lock);
-        rc = MDP(exp->exp_obd, revalidate_lock)(exp, it, fid, bits);
+        rc = MDP(exp->exp_obd, revalidate_lock)(exp, it, fid);
         RETURN(rc);
 }
 
@@ -2228,6 +2237,6 @@ int mea_name2idx(struct lmv_stripe_md *mea, const char *name, int namelen);
 int raw_name2idx(int hashtype, int count, const char *name, int namelen);
 
 /* prng.c */
-void ll_generate_random_uuid(class_uuid_t uuid_out);
+#define ll_generate_random_uuid(uuid_out) cfs_get_random_bytes(uuid_out, sizeof(class_uuid_t))
 
 #endif /* __LINUX_OBD_CLASS_H */