X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_log.h;h=31bd54306878ad92d591e8faf8c6a15dca87dc8b;hb=9a3d6c2ed76ba902158a101be5b3dce46ca8f630;hp=9f6725fa510baead144c4606d44752fc9d010aaf;hpb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_log.h b/lustre/include/lustre_log.h
index 9f6725f..31bd543 100644
--- a/lustre/include/lustre_log.h
+++ b/lustre/include/lustre_log.h
@@ -118,9 +118,10 @@ int llog_cat_reverse_process(struct llog_handle *cat_llh, llog_cb_t cb, void *da
 int llog_cat_set_first_idx(struct llog_handle *cathandle, int index);
 
 /* llog_obd.c */
-int llog_setup(struct obd_device *obd, struct obd_llogs *llogs, int index,
+int llog_setup(struct obd_device *obd, struct obd_llog_group *olg, int index,
                struct obd_device *disk_obd, int count,  struct llog_logid *logid,
                struct llog_operations *op);
+int __llog_ctxt_put(struct llog_ctxt *ctxt);
 int llog_cleanup(struct llog_ctxt *);
 int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp);
 int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
@@ -129,7 +130,7 @@ int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
 int llog_cancel(struct llog_ctxt *, struct lov_stripe_md *lsm,
                 int count, struct llog_cookie *cookies, int flags);
 
-int llog_obd_origin_setup(struct obd_device *obd, struct obd_llogs *llogs, 
+int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg, 
                           int index, struct obd_device *disk_obd, int count,
                           struct llog_logid *logid);
 int llog_obd_origin_cleanup(struct llog_ctxt *ctxt);
@@ -137,9 +138,9 @@ int llog_obd_origin_add(struct llog_ctxt *ctxt,
                         struct llog_rec_hdr *rec, struct lov_stripe_md *lsm,
                         struct llog_cookie *logcookies, int numcookies);
 
-int llog_cat_initialize(struct obd_device *obd, struct obd_llogs *llogs,
+int llog_cat_initialize(struct obd_device *obd, struct obd_llog_group *olg,
                         int count, struct obd_uuid *uuid);
-int obd_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+int obd_llog_init(struct obd_device *obd, int group,
                   struct obd_device *disk_obd, int count, 
                   struct llog_catid *logid, struct obd_uuid *uuid);
 
@@ -182,7 +183,7 @@ struct llog_operations {
         int (*lop_close)(struct llog_handle *handle);
         int (*lop_read_header)(struct llog_handle *handle);
 
-        int (*lop_setup)(struct obd_device *obd, struct obd_llogs *llogs, 
+        int (*lop_setup)(struct obd_device *obd, struct obd_llog_group *olg, 
                          int ctxt_idx, struct obd_device *disk_obd, int count,
                          struct llog_logid *logid);
         int (*lop_sync)(struct llog_ctxt *ctxt, struct obd_export *exp);
@@ -207,6 +208,7 @@ struct llog_ctxt {
         int                      loc_idx; /* my index the obd array of ctxt's */
         struct llog_gen          loc_gen;
         struct obd_device       *loc_obd; /* points back to the containing obd*/
+        struct obd_llog_group     *loc_olg; /* group containing that ctxt */
         struct obd_export       *loc_exp; /* parent "disk" export (e.g. MDS) */
         struct obd_import       *loc_imp; /* to use in RPC's: can be backward
                                              pointing import */
@@ -214,9 +216,19 @@ struct llog_ctxt {
         struct llog_handle      *loc_handle;
         struct llog_canceld_ctxt *loc_llcd;
         struct semaphore         loc_sem; /* protects loc_llcd and loc_imp */
+        atomic_t                   loc_refcount;
+        struct llog_commit_master *loc_lcm;
         void                    *llog_proc_cb;
 };
 
+#ifndef __KERNEL__
+
+#define cap_raise(c, flag) do {} while(0)
+
+#define CAP_SYS_RESOURCE 24
+
+#endif   /* !__KERNEL__ */
+
 static inline void llog_gen_init(struct llog_ctxt *ctxt)
 {
         struct obd_device *obd = ctxt->loc_exp->exp_obd;
@@ -269,21 +281,93 @@ static inline int llog_data_len(int len)
         return size_round(len);
 }
 
+static inline struct llog_ctxt *llog_ctxt_get(struct llog_ctxt *ctxt)
+{
+        LASSERT(atomic_read(&ctxt->loc_refcount) > 0);
+        atomic_inc(&ctxt->loc_refcount);
+        CDEBUG(D_INFO, "GETting ctxt %p : new refcount %d\n", ctxt,
+               atomic_read(&ctxt->loc_refcount));
+        return ctxt;
+}
+
+static inline void llog_ctxt_put(struct llog_ctxt *ctxt)
+{
+        if (ctxt == NULL)
+                return;
+        CDEBUG(D_INFO, "PUTting ctxt %p : new refcount %d\n", ctxt,
+               atomic_read(&ctxt->loc_refcount) - 1);
+        LASSERT(atomic_read(&ctxt->loc_refcount) > 0);
+        LASSERT(atomic_read(&ctxt->loc_refcount) < 0x5a5a5a);
+        __llog_ctxt_put(ctxt);
+}
+
+static inline void llog_group_init(struct obd_llog_group *olg, int group)
+{
+        cfs_waitq_init(&olg->olg_waitq);
+        spin_lock_init(&olg->olg_lock);
+        olg->olg_group = group;
+}
+
+static inline void llog_group_set_export(struct obd_llog_group *olg,
+                                         struct obd_export *exp)
+{
+        LASSERT(exp != NULL);
+        
+        spin_lock(&olg->olg_lock);
+        if (olg->olg_exp != NULL && olg->olg_exp != exp)
+                CWARN("%s: export for group %d is changed: 0x%p -> 0x%p\n",
+                      exp->exp_obd->obd_name, olg->olg_group,
+                      olg->olg_exp, exp);
+        olg->olg_exp = exp;
+        spin_unlock(&olg->olg_lock);
+}
+
+static inline int llog_group_set_ctxt(struct obd_llog_group *olg,
+                                      struct llog_ctxt *ctxt, int index)
+{
+        LASSERT(index >= 0 && index < LLOG_MAX_CTXTS);
+
+        spin_lock(&olg->olg_lock);  
+        if (olg->olg_ctxts[index] != NULL) {
+                spin_unlock(&olg->olg_lock);
+                return -EEXIST;
+        }
+        olg->olg_ctxts[index] = ctxt;
+        spin_unlock(&olg->olg_lock);
+        return 0;
+}
+
+static inline struct llog_ctxt *llog_group_get_ctxt(struct obd_llog_group *olg,
+                                                    int index)
+{
+        struct llog_ctxt *ctxt;
+
+        LASSERT(index >= 0 && index < LLOG_MAX_CTXTS);
+
+        spin_lock(&olg->olg_lock);  
+        if (olg->olg_ctxts[index] == NULL) {
+                ctxt = NULL;
+        } else {
+                ctxt = llog_ctxt_get(olg->olg_ctxts[index]);
+        }
+        spin_unlock(&olg->olg_lock);
+        return ctxt;
+}
+
 static inline struct llog_ctxt *llog_get_context(struct obd_device *obd,
                                                  int index)
 {
-        if (index < 0 || index >= LLOG_MAX_CTXTS)
-                return NULL;
+        return llog_group_get_ctxt(&obd->obd_olg, index);
+}
 
-        return obd->obd_llog_ctxt[index];
+static inline int llog_group_ctxt_null(struct obd_llog_group *olg, int index)
+{
+        return (olg->olg_ctxts[index] == NULL);
 }
 
-static inline struct llog_ctxt *
-llog_get_context_from_llogs(struct obd_llogs *llogs, int index)
-{                
-        if (index < 0 || index >= LLOG_MAX_CTXTS)
-                return NULL;
-        return llogs->llog_ctxt[index];
+static inline int llog_ctxt_null(struct obd_device *obd, int index)
+{
+        return (llog_group_ctxt_null(&obd->obd_olg, index));
 }
 
 static inline int llog_write_rec(struct llog_handle *handle,
@@ -292,6 +376,7 @@ static inline int llog_write_rec(struct llog_handle *handle,
                                  int numcookies, void *buf, int idx)
 {
         struct llog_operations *lop;
+        __u32 cap;
         int rc, buflen;
         ENTRY;
 
@@ -309,7 +394,10 @@ static inline int llog_write_rec(struct llog_handle *handle,
                 buflen = rec->lrh_len;
         LASSERT(size_round(buflen) == buflen);
 
+        cap = current->cap_effective;             
+        cap_raise(current->cap_effective, CAP_SYS_RESOURCE); 
         rc = lop->lop_write_rec(handle, rec, logcookies, numcookies, buf, idx);
+        current->cap_effective = cap; 
         RETURN(rc);
 }
 
@@ -405,6 +493,7 @@ static inline int llog_create(struct llog_ctxt *ctxt, struct llog_handle **res,
                               struct llog_logid *logid, char *name)
 {
         struct llog_operations *lop;
+        __u32 cap;
         int rc;
         ENTRY;
 
@@ -414,7 +503,10 @@ static inline int llog_create(struct llog_ctxt *ctxt, struct llog_handle **res,
         if (lop->lop_create == NULL)
                 RETURN(-EOPNOTSUPP);
 
+        cap = current->cap_effective;             
+        cap_raise(current->cap_effective, CAP_SYS_RESOURCE);
         rc = lop->lop_create(ctxt, res, logid, name);
+        current->cap_effective = cap; 
         RETURN(rc);
 }