X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog.c;h=6469578a1fdaf77b8c19009842a3fefcb2e53911;hb=4b534dc36d0210630a3842a22daf4ef5971bfaf7;hp=de2b350c4f78706df572de05c35bdddff49f6bb3;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog.c b/lustre/obdclass/llog.c index de2b350..6469578 100644 --- a/lustre/obdclass/llog.c +++ b/lustre/obdclass/llog.c @@ -16,8 +16,8 @@ * in the LICENSE file that accompanied this code). * * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see [sun.com URL with a - * copy of GPLv2]. + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, * CA 95054 USA or visit www.sun.com if you need additional information or @@ -26,7 +26,7 @@ * 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. */ /* @@ -68,7 +68,7 @@ struct llog_handle *llog_alloc_handle(void) if (loghandle == NULL) RETURN(ERR_PTR(-ENOMEM)); - init_rwsem(&loghandle->lgh_lock); + cfs_init_rwsem(&loghandle->lgh_lock); RETURN(loghandle); } @@ -83,9 +83,9 @@ void llog_free_handle(struct llog_handle *loghandle) if (!loghandle->lgh_hdr) goto out; if (loghandle->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN) - list_del_init(&loghandle->u.phd.phd_entry); + cfs_list_del_init(&loghandle->u.phd.phd_entry); if (loghandle->lgh_hdr->llh_flags & LLOG_F_IS_CAT) - LASSERT(list_empty(&loghandle->u.chd.chd_head)); + LASSERT(cfs_list_empty(&loghandle->u.chd.chd_head)); OBD_FREE(loghandle->lgh_hdr, LLOG_CHUNK_SIZE); out: @@ -100,17 +100,17 @@ int llog_cancel_rec(struct llog_handle *loghandle, int index) int rc = 0; ENTRY; - CDEBUG(D_RPCTRACE, "canceling %d in log "LPX64"\n", + CDEBUG(D_RPCTRACE, "Canceling %d in log "LPX64"\n", index, loghandle->lgh_id.lgl_oid); if (index == 0) { - CERROR("cannot cancel index 0 (which is header)\n"); + CERROR("Can't cancel index 0 which is header\n"); RETURN(-EINVAL); } if (!ext2_clear_bit(index, llh->llh_bitmap)) { - CDEBUG(D_RPCTRACE, "catalog index %u already clear?\n", index); - RETURN(-EINVAL); + CDEBUG(D_RPCTRACE, "Catalog index %u already clear?\n", index); + RETURN(-ENOENT); } llh->llh_count--; @@ -120,7 +120,7 @@ int llog_cancel_rec(struct llog_handle *loghandle, int index) (loghandle->lgh_last_idx == (LLOG_BITMAP_BYTES * 8) - 1)) { rc = llog_destroy(loghandle); if (rc) { - CERROR("failure destroying log after last cancel: %d\n", + CERROR("Failure destroying log after last cancel: %d\n", rc); ext2_set_bit(index, llh->llh_bitmap); llh->llh_count++; @@ -132,7 +132,7 @@ int llog_cancel_rec(struct llog_handle *loghandle, int index) rc = llog_write_rec(loghandle, &llh->llh_hdr, NULL, 0, NULL, 0); if (rc) { - CERROR("failure re-writing header %d\n", rc); + CERROR("Failure re-writing header %d\n", rc); ext2_set_bit(index, llh->llh_bitmap); llh->llh_count++; } @@ -237,19 +237,20 @@ static int llog_process_thread(void *arg) if (!buf) { lpi->lpi_rc = -ENOMEM; #ifdef __KERNEL__ - complete(&lpi->lpi_completion); + cfs_complete(&lpi->lpi_completion); #endif return 0; } - cfs_daemonize_ctxt("llog_process_thread"); + if (!(lpi->lpi_flags & LLOG_FLAG_NODEAMON)) + cfs_daemonize_ctxt("llog_process_thread"); if (cd != NULL) { - last_called_index = cd->first_idx; - index = cd->first_idx + 1; + last_called_index = cd->lpcd_first_idx; + index = cd->lpcd_first_idx + 1; } - if (cd != NULL && cd->last_idx) - last_index = cd->last_idx; + if (cd != NULL && cd->lpcd_last_idx) + last_index = cd->lpcd_last_idx; else last_index = LLOG_BITMAP_BYTES * 8 - 1; @@ -323,10 +324,6 @@ static int llog_process_thread(void *arg) lpi->lpi_cbdata); last_called_index = index; if (rc == LLOG_PROC_BREAK) { - CDEBUG(D_HA, "recovery from log: "LPX64 - ":%x stopped\n", - loghandle->lgh_id.lgl_oid, - loghandle->lgh_id.lgl_ogen); GOTO(out, rc); } else if (rc == LLOG_DEL_RECORD) { llog_cancel_rec(loghandle, @@ -348,18 +345,18 @@ static int llog_process_thread(void *arg) out: if (cd != NULL) - cd->last_idx = last_called_index; + cd->lpcd_last_idx = last_called_index; if (buf) OBD_FREE(buf, LLOG_CHUNK_SIZE); lpi->lpi_rc = rc; #ifdef __KERNEL__ - complete(&lpi->lpi_completion); + cfs_complete(&lpi->lpi_completion); #endif return 0; } -int llog_process(struct llog_handle *loghandle, llog_cb_t cb, - void *data, void *catdata) +int llog_process_flags(struct llog_handle *loghandle, llog_cb_t cb, + void *data, void *catdata, int flags) { struct llog_process_info *lpi; int rc; @@ -374,16 +371,17 @@ int llog_process(struct llog_handle *loghandle, llog_cb_t cb, lpi->lpi_cb = cb; lpi->lpi_cbdata = data; lpi->lpi_catdata = catdata; + lpi->lpi_flags = flags; #ifdef __KERNEL__ - init_completion(&lpi->lpi_completion); + cfs_init_completion(&lpi->lpi_completion); rc = cfs_kernel_thread(llog_process_thread, lpi, CLONE_VM | CLONE_FILES); if (rc < 0) { CERROR("cannot start thread: %d\n", rc); OBD_FREE_PTR(lpi); RETURN(rc); } - wait_for_completion(&lpi->lpi_completion); + cfs_wait_for_completion(&lpi->lpi_completion); #else llog_process_thread(lpi); #endif @@ -391,6 +389,13 @@ int llog_process(struct llog_handle *loghandle, llog_cb_t cb, OBD_FREE_PTR(lpi); RETURN(rc); } +EXPORT_SYMBOL(llog_process_flags); + +int llog_process(struct llog_handle *loghandle, llog_cb_t cb, + void *data, void *catdata) +{ + return llog_process_flags(loghandle, cb, data, catdata, 0); +} EXPORT_SYMBOL(llog_process); inline int llog_get_size(struct llog_handle *loghandle) @@ -415,9 +420,9 @@ int llog_reverse_process(struct llog_handle *loghandle, llog_cb_t cb, RETURN(-ENOMEM); if (cd != NULL) - first_index = cd->first_idx + 1; - if (cd != NULL && cd->last_idx) - index = cd->last_idx; + first_index = cd->lpcd_first_idx + 1; + if (cd != NULL && cd->lpcd_last_idx) + index = cd->lpcd_last_idx; else index = LLOG_BITMAP_BYTES * 8 - 1; @@ -462,10 +467,6 @@ int llog_reverse_process(struct llog_handle *loghandle, llog_cb_t cb, if (ext2_test_bit(index, llh->llh_bitmap)) { rc = cb(loghandle, rec, data); if (rc == LLOG_PROC_BREAK) { - CWARN("recovery from log: "LPX64":%x" - " stopped\n", - loghandle->lgh_id.lgl_oid, - loghandle->lgh_id.lgl_ogen); GOTO(out, rc); } if (rc)