X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_ioctl.c;h=ca1877e3257a511ddcefd9a2f67fa8e2dd06dc71;hb=c5e8e49281ac04feca9ddbc13dc87acb5b20e57d;hp=14d20f23962156aabf80c41e146b317c9d037364;hpb=ff17cc7e0282d9b1522810e0c5d12171c4d46a2d;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_ioctl.c b/lustre/obdclass/llog_ioctl.c index 14d20f2..ca1877e 100644 --- a/lustre/obdclass/llog_ioctl.c +++ b/lustre/obdclass/llog_ioctl.c @@ -1,9 +1,37 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * GPL HEADER START + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * 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 + * 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 + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_LOG @@ -12,16 +40,16 @@ #define EXPORT_SYMTAB #endif -#include -#include -#include -#include +#include +#include +#include #include "llog_internal.h" static int str2logid(struct llog_logid *logid, char *str, int len) { char *start, *end, *endp; + ENTRY; start = str; if (*start != '#') RETURN(-EINVAL); @@ -34,7 +62,7 @@ static int str2logid(struct llog_logid *logid, char *str, int len) RETURN(-EINVAL); *end = '\0'; - logid->lgl_oid = simple_strtoull(start, &endp, 16); + logid->lgl_oid = simple_strtoull(start, &endp, 0); if (endp != end) RETURN(-EINVAL); @@ -46,7 +74,7 @@ static int str2logid(struct llog_logid *logid, char *str, int len) RETURN(-EINVAL); *end = '\0'; - logid->lgl_ogr = simple_strtoull(start, &endp, 16); + logid->lgl_ogr = simple_strtoull(start, &endp, 0); if (endp != end) RETURN(-EINVAL); @@ -69,6 +97,7 @@ static int llog_check_cb(struct llog_handle *handle, struct llog_rec_hdr *rec, char *endp; int cur_index, rc = 0; + ENTRY; cur_index = rec->lrh_index; if (ioc_data && (ioc_data->ioc_inllen1)) { @@ -102,7 +131,14 @@ static int llog_check_cb(struct llog_handle *handle, struct llog_rec_hdr *rec, } if (handle->lgh_ctxt == NULL) RETURN(-EOPNOTSUPP); - llog_cat_id2handle(handle, &log_handle, &lir->lid_id); + rc = llog_cat_id2handle(handle, &log_handle, &lir->lid_id); + if (rc) { + CDEBUG(D_IOCTL, + "cannot find log #"LPX64"#"LPX64"#%08x\n", + lir->lid_id.lgl_oid, lir->lid_id.lgl_ogr, + lir->lid_id.lgl_ogen); + RETURN(rc); + } rc = llog_process(log_handle, llog_check_cb, NULL, NULL); llog_close(log_handle); } else { @@ -110,8 +146,9 @@ static int llog_check_cb(struct llog_handle *handle, struct llog_rec_hdr *rec, case OST_SZ_REC: case OST_RAID1_REC: case MDS_UNLINK_REC: + case MDS_SETATTR_REC: + case MDS_SETATTR64_REC: case OBD_CFG_REC: - case PTL_CFG_REC: case LLOG_HDR_MAGIC: { l = snprintf(out, remains, "[index]: %05d [type]: " "%02x [len]: %04d ok\n", @@ -152,6 +189,7 @@ static int llog_print_cb(struct llog_handle *handle, struct llog_rec_hdr *rec, char *endp; int cur_index; + ENTRY; if (ioc_data->ioc_inllen1) { l = 0; remains = ioc_data->ioc_inllen4 + @@ -205,6 +243,7 @@ static int llog_remove_log(struct llog_handle *cat, struct llog_logid *logid) struct llog_handle *log; int rc, index = 0; + ENTRY; down_write(&cat->lgh_lock); rc = llog_cat_id2handle(cat, &log, logid); if (rc) { @@ -235,8 +274,9 @@ static int llog_delete_cb(struct llog_handle *handle, struct llog_rec_hdr *rec, struct llog_logid_rec *lir = (struct llog_logid_rec*)rec; int rc; + ENTRY; if (rec->lrh_type != LLOG_LOGID_MAGIC) - return (-EINVAL); + RETURN (-EINVAL); rc = llog_remove_log(handle, &lir->lid_id); RETURN(rc); @@ -249,6 +289,7 @@ int llog_ioctl(struct llog_ctxt *ctxt, int cmd, struct obd_ioctl_data *data) int err = 0; struct llog_handle *handle = NULL; + ENTRY; if (*data->ioc_inlbuf1 == '#') { err = str2logid(&logid, data->ioc_inlbuf1, data->ioc_inllen1); if (err) @@ -305,9 +346,11 @@ int llog_ioctl(struct llog_ctxt *ctxt, int cmd, struct obd_ioctl_data *data) case OBD_IOC_LLOG_PRINT: { LASSERT(data->ioc_inllen1); - err = llog_process(handle, llog_print_cb, data, NULL); + err = llog_process(handle, class_config_dump_handler,data,NULL); if (err == -LLOG_EEMPTY) err = 0; + else + err = llog_process(handle, llog_print_cb, data, NULL); GOTO(out_close, err); } @@ -316,15 +359,23 @@ int llog_ioctl(struct llog_ctxt *ctxt, int cmd, struct obd_ioctl_data *data) struct llog_logid plain; char *endp; - if (!(handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT)) + cookie.lgc_index = simple_strtoul(data->ioc_inlbuf3, &endp, 0); + if (*endp != '\0') GOTO(out_close, err = -EINVAL); + if (handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT) { + down_write(&handle->lgh_lock); + err = llog_cancel_rec(handle, cookie.lgc_index); + up_write(&handle->lgh_lock); + GOTO(out_close, err); + } + err = str2logid(&plain, data->ioc_inlbuf2, data->ioc_inllen2); if (err) GOTO(out_close, err); cookie.lgc_lgl = plain; - cookie.lgc_index = simple_strtoul(data->ioc_inlbuf3, &endp, 0); - if (*endp != '\0') + + if (!(handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT)) GOTO(out_close, err = -EINVAL); err = llog_cat_cancel_records(handle, 1, &cookie); @@ -333,6 +384,13 @@ int llog_ioctl(struct llog_ctxt *ctxt, int cmd, struct obd_ioctl_data *data) case OBD_IOC_LLOG_REMOVE: { struct llog_logid plain; + if (handle->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN) { + err = llog_destroy(handle); + if (!err) + llog_free_handle(handle); + GOTO(out, err); + } + if (!(handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT)) GOTO(out_close, err = -EINVAL); @@ -362,8 +420,8 @@ out: } EXPORT_SYMBOL(llog_ioctl); -int llog_catlog_list(struct obd_device *obd, int count, - struct obd_ioctl_data *data) +int llog_catalog_list(struct obd_device *obd, int count, + struct obd_ioctl_data *data) { int size, i; struct llog_catid *idarray; @@ -372,18 +430,17 @@ int llog_catlog_list(struct obd_device *obd, int count, char *out; int l, remains, rc = 0; + ENTRY; size = sizeof(*idarray) * count; - OBD_ALLOC(idarray, size); + OBD_VMALLOC(idarray, size); if (!idarray) RETURN(-ENOMEM); - memset(idarray, 0, size); - rc = llog_get_cat_list(obd, obd, name, count, idarray); - if (rc) { - OBD_FREE(idarray, size); - RETURN(rc); - } + mutex_down(&obd->obd_olg.olg_cat_processing); + rc = llog_get_cat_list(obd, name, 0, count, idarray); + if (rc) + GOTO(out, rc); out = data->ioc_bulk; remains = data->ioc_inllen1; @@ -399,8 +456,12 @@ int llog_catlog_list(struct obd_device *obd, int count, break; } } - OBD_FREE(idarray, size); - RETURN(0); +out: + /* release semaphore */ + mutex_up(&obd->obd_olg.olg_cat_processing); + + OBD_VFREE(idarray, size); + RETURN(rc); } -EXPORT_SYMBOL(llog_catlog_list); +EXPORT_SYMBOL(llog_catalog_list);