X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Finclude%2Flustre_log.h;h=0b965776fae64218ee1ea0f34db453993bf22b67;hb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768;hp=81151cceb94c5f4d48a7f845c82c613b431dd75e;hpb=65701b4a30efdb695776bcf690a2b3cabc928da1;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_log.h b/lustre/include/lustre_log.h index 81151cc..0b96577 100644 --- a/lustre/include/lustre_log.h +++ b/lustre/include/lustre_log.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -289,7 +287,7 @@ struct llog_ctxt { struct llog_handle *loc_handle; struct llog_commit_master *loc_lcm; struct llog_canceld_ctxt *loc_llcd; - cfs_semaphore_t loc_sem; /* protects loc_llcd and loc_imp */ + cfs_mutex_t loc_mutex; /* protects loc_llcd and loc_imp */ cfs_atomic_t loc_refcount; void *llog_proc_cb; long loc_flags; /* flags, see above defines */ @@ -457,7 +455,7 @@ static inline void llog_group_init(struct obd_llog_group *olg, int group) { cfs_waitq_init(&olg->olg_waitq); cfs_spin_lock_init(&olg->olg_lock); - cfs_sema_init(&olg->olg_cat_processing, 1); + cfs_mutex_init(&olg->olg_cat_processing); olg->olg_seq = group; }