Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=24037 Remove iopen ldiskfs patch for rhel5.
[fs/lustre-release.git]
/
lustre
/
obdclass
/
llog_obd.c
diff --git
a/lustre/obdclass/llog_obd.c
b/lustre/obdclass/llog_obd.c
index
c0fb21b
..
1c8eccf
100644
(file)
--- a/
lustre/obdclass/llog_obd.c
+++ b/
lustre/obdclass/llog_obd.c
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-59,7
+59,7
@@
static struct llog_ctxt* llog_new_ctxt(struct obd_device *obd)
return NULL;
ctxt->loc_obd = obd;
return NULL;
ctxt->loc_obd = obd;
- atomic_set(&ctxt->loc_refcount, 1);
+
cfs_
atomic_set(&ctxt->loc_refcount, 1);
return ctxt;
}
return ctxt;
}
@@
-84,20
+84,21
@@
int __llog_ctxt_put(struct llog_ctxt *ctxt)
struct obd_device *obd;
int rc = 0;
struct obd_device *obd;
int rc = 0;
- spin_lock(&olg->olg_lock);
- if (!atomic_dec_and_test(&ctxt->loc_refcount)) {
- spin_unlock(&olg->olg_lock);
+
cfs_
spin_lock(&olg->olg_lock);
+ if (!
cfs_
atomic_dec_and_test(&ctxt->loc_refcount)) {
+
cfs_
spin_unlock(&olg->olg_lock);
return rc;
}
olg->olg_ctxts[ctxt->loc_idx] = NULL;
return rc;
}
olg->olg_ctxts[ctxt->loc_idx] = NULL;
- spin_unlock(&olg->olg_lock);
+
cfs_
spin_unlock(&olg->olg_lock);
if (ctxt->loc_lcm)
lcm_put(ctxt->loc_lcm);
obd = ctxt->loc_obd;
if (ctxt->loc_lcm)
lcm_put(ctxt->loc_lcm);
obd = ctxt->loc_obd;
- spin_lock(&obd->obd_dev_lock);
- spin_unlock(&obd->obd_dev_lock); /* sync with llog ctxt user thread */
+ cfs_spin_lock(&obd->obd_dev_lock);
+ /* sync with llog ctxt user thread */
+ cfs_spin_unlock(&obd->obd_dev_lock);
/* obd->obd_starting is needed for the case of cleanup
* in error case while obd is starting up. */
/* obd->obd_starting is needed for the case of cleanup
* in error case while obd is starting up. */
@@
-111,7
+112,7
@@
int __llog_ctxt_put(struct llog_ctxt *ctxt)
rc = CTXTP(ctxt, cleanup)(ctxt);
llog_ctxt_destroy(ctxt);
rc = CTXTP(ctxt, cleanup)(ctxt);
llog_ctxt_destroy(ctxt);
-
wake_up
(&olg->olg_waitq);
+
cfs_waitq_signal
(&olg->olg_waitq);
return rc;
}
EXPORT_SYMBOL(__llog_ctxt_put);
return rc;
}
EXPORT_SYMBOL(__llog_ctxt_put);
@@
-135,8
+136,8
@@
int llog_cleanup(struct llog_ctxt *ctxt)
/*
* Banlance the ctxt get when calling llog_cleanup()
*/
/*
* Banlance the ctxt get when calling llog_cleanup()
*/
- LASSERT(atomic_read(&ctxt->loc_refcount) < 0x5a5a5a);
- LASSERT(atomic_read(&ctxt->loc_refcount) > 1);
+ LASSERT(
cfs_
atomic_read(&ctxt->loc_refcount) < 0x5a5a5a);
+ LASSERT(
cfs_
atomic_read(&ctxt->loc_refcount) > 1);
llog_ctxt_put(ctxt);
/*
llog_ctxt_put(ctxt);
/*
@@
-176,7
+177,7
@@
int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg,
ctxt->loc_olg = olg;
ctxt->loc_idx = index;
ctxt->loc_logops = op;
ctxt->loc_olg = olg;
ctxt->loc_idx = index;
ctxt->loc_logops = op;
- sema_init(&ctxt->loc_sem, 1);
+
cfs_
sema_init(&ctxt->loc_sem, 1);
ctxt->loc_exp = class_export_get(disk_obd->obd_self_export);
ctxt->loc_flags = LLOG_CTXT_FLAG_UNINITIALIZED;
ctxt->loc_exp = class_export_get(disk_obd->obd_self_export);
ctxt->loc_flags = LLOG_CTXT_FLAG_UNINITIALIZED;
@@
-315,6
+316,10
@@
static int cat_cancel_cb(struct llog_handle *cathandle,
if (rc) {
CERROR("Cannot find handle for log "LPX64"\n",
lir->lid_id.lgl_oid);
if (rc) {
CERROR("Cannot find handle for log "LPX64"\n",
lir->lid_id.lgl_oid);
+ if (rc == -ENOENT) {
+ index = rec->lrh_index;
+ goto cat_cleanup;
+ }
RETURN(rc);
}
RETURN(rc);
}
@@
-328,6
+333,7
@@
static int cat_cancel_cb(struct llog_handle *cathandle,
index = loghandle->u.phd.phd_cookie.lgc_index;
llog_free_handle(loghandle);
index = loghandle->u.phd.phd_cookie.lgc_index;
llog_free_handle(loghandle);
+cat_cleanup:
LASSERT(index);
llog_cat_set_first_idx(cathandle, index);
rc = llog_cancel_rec(cathandle, index);
LASSERT(index);
llog_cat_set_first_idx(cathandle, index);
rc = llog_cancel_rec(cathandle, index);
@@
-402,9
+408,9
@@
int llog_obd_origin_cleanup(struct llog_ctxt *ctxt)
cathandle = ctxt->loc_handle;
if (cathandle) {
cathandle = ctxt->loc_handle;
if (cathandle) {
- list_for_each_entry_safe(loghandle, n,
- &cathandle->u.chd.chd_head,
- u.phd.phd_entry) {
+
cfs_
list_for_each_entry_safe(loghandle, n,
+
&cathandle->u.chd.chd_head,
+
u.phd.phd_entry) {
llh = loghandle->lgh_hdr;
if ((llh->llh_flags &
LLOG_F_ZAP_WHEN_EMPTY) &&
llh = loghandle->lgh_hdr;
if ((llh->llh_flags &
LLOG_F_ZAP_WHEN_EMPTY) &&