X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_ioctl.c;h=aa91695890309719a72eef9a821e3abc3a46da76;hb=f2f09b6ecd85ceb05cd64907a71f87bbc49bfc21;hp=bc8afc60e9b5d2b469c07b56e697076c753d4ab7;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_ioctl.c b/lustre/obdclass/llog_ioctl.c index bc8afc6..aa91695 100644 --- a/lustre/obdclass/llog_ioctl.c +++ b/lustre/obdclass/llog_ioctl.c @@ -1,25 +1,39 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2005 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * 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. * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License 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). * - * In either case, Lustre 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 - * license text for more details. + * 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 (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2011, Whamcloud, Inc. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_LOG @@ -62,7 +76,7 @@ static int str2logid(struct llog_logid *logid, char *str, int len) RETURN(-EINVAL); *end = '\0'; - logid->lgl_ogr = simple_strtoull(start, &endp, 0); + logid->lgl_oseq = simple_strtoull(start, &endp, 0); if (endp != end) RETURN(-EINVAL); @@ -91,9 +105,9 @@ static int llog_check_cb(struct llog_handle *handle, struct llog_rec_hdr *rec, if (ioc_data && (ioc_data->ioc_inllen1)) { l = 0; remains = ioc_data->ioc_inllen4 + - size_round(ioc_data->ioc_inllen1) + - size_round(ioc_data->ioc_inllen2) + - size_round(ioc_data->ioc_inllen3); + cfs_size_round(ioc_data->ioc_inllen1) + + cfs_size_round(ioc_data->ioc_inllen2) + + cfs_size_round(ioc_data->ioc_inllen3); from = simple_strtol(ioc_data->ioc_inlbuf2, &endp, 0); if (*endp != '\0') RETURN(-EINVAL); @@ -123,7 +137,7 @@ static int llog_check_cb(struct llog_handle *handle, struct llog_rec_hdr *rec, 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_oid, lir->lid_id.lgl_oseq, lir->lid_id.lgl_ogen); RETURN(rc); } @@ -135,6 +149,7 @@ static int llog_check_cb(struct llog_handle *handle, struct llog_rec_hdr *rec, case OST_RAID1_REC: case MDS_UNLINK_REC: case MDS_SETATTR_REC: + case MDS_SETATTR64_REC: case OBD_CFG_REC: case LLOG_HDR_MAGIC: { l = snprintf(out, remains, "[index]: %05d [type]: " @@ -180,9 +195,9 @@ static int llog_print_cb(struct llog_handle *handle, struct llog_rec_hdr *rec, if (ioc_data->ioc_inllen1) { l = 0; remains = ioc_data->ioc_inllen4 + - size_round(ioc_data->ioc_inllen1) + - size_round(ioc_data->ioc_inllen2) + - size_round(ioc_data->ioc_inllen3); + cfs_size_round(ioc_data->ioc_inllen1) + + cfs_size_round(ioc_data->ioc_inllen2) + + cfs_size_round(ioc_data->ioc_inllen3); from = simple_strtol(ioc_data->ioc_inlbuf2, &endp, 0); if (*endp != '\0') RETURN(-EINVAL); @@ -209,7 +224,7 @@ static int llog_print_cb(struct llog_handle *handle, struct llog_rec_hdr *rec, l = snprintf(out, remains, "[index]: %05d [logid]: #"LPX64"#"LPX64"#%08x\n", cur_index, lir->lid_id.lgl_oid, - lir->lid_id.lgl_ogr, lir->lid_id.lgl_ogen); + lir->lid_id.lgl_oseq, lir->lid_id.lgl_ogen); } else { l = snprintf(out, remains, "[index]: %05d [type]: %02x [len]: %04d\n", @@ -231,11 +246,11 @@ static int llog_remove_log(struct llog_handle *cat, struct llog_logid *logid) int rc, index = 0; ENTRY; - down_write(&cat->lgh_lock); + cfs_down_write(&cat->lgh_lock); rc = llog_cat_id2handle(cat, &log, logid); if (rc) { CDEBUG(D_IOCTL, "cannot find log #"LPX64"#"LPX64"#%08x\n", - logid->lgl_oid, logid->lgl_ogr, logid->lgl_ogen); + logid->lgl_oid, logid->lgl_oseq, logid->lgl_ogen); GOTO(out, rc = -ENOENT); } @@ -250,7 +265,7 @@ static int llog_remove_log(struct llog_handle *cat, struct llog_logid *logid) rc = llog_cancel_rec(cat, index); out: llog_free_handle(log); - up_write(&cat->lgh_lock); + cfs_up_write(&cat->lgh_lock); RETURN(rc); } @@ -301,7 +316,7 @@ int llog_ioctl(struct llog_ctxt *ctxt, int cmd, struct obd_ioctl_data *data) case OBD_IOC_LLOG_INFO: { int l; int remains = data->ioc_inllen2 + - size_round(data->ioc_inllen1); + cfs_size_round(data->ioc_inllen1); char *out = data->ioc_bulk; l = snprintf(out, remains, @@ -309,7 +324,7 @@ int llog_ioctl(struct llog_ctxt *ctxt, int cmd, struct obd_ioctl_data *data) "flags: %x (%s)\n" "records count: %d\n" "last index: %d\n", - handle->lgh_id.lgl_oid, handle->lgh_id.lgl_ogr, + handle->lgh_id.lgl_oid, handle->lgh_id.lgl_oseq, handle->lgh_id.lgl_ogen, handle->lgh_hdr->llh_flags, handle->lgh_hdr->llh_flags & @@ -351,9 +366,9 @@ int llog_ioctl(struct llog_ctxt *ctxt, int cmd, struct obd_ioctl_data *data) GOTO(out_close, err = -EINVAL); if (handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT) { - down_write(&handle->lgh_lock); + cfs_down_write(&handle->lgh_lock); err = llog_cancel_rec(handle, cookie.lgc_index); - up_write(&handle->lgh_lock); + cfs_up_write(&handle->lgh_lock); GOTO(out_close, err); } @@ -420,16 +435,14 @@ int llog_catalog_list(struct obd_device *obd, int count, ENTRY; size = sizeof(*idarray) * count; - OBD_ALLOC(idarray, size); + OBD_ALLOC_LARGE(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); - } + cfs_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; @@ -437,7 +450,7 @@ int llog_catalog_list(struct obd_device *obd, int count, id = &idarray[i].lci_logid; l = snprintf(out, remains, "catalog log: #"LPX64"#"LPX64"#%08x\n", - id->lgl_oid, id->lgl_ogr, id->lgl_ogen); + id->lgl_oid, id->lgl_oseq, id->lgl_ogen); out += l; remains -= l; if (remains <= 0) { @@ -445,8 +458,12 @@ int llog_catalog_list(struct obd_device *obd, int count, break; } } - OBD_FREE(idarray, size); - RETURN(0); +out: + /* release semaphore */ + cfs_mutex_up(&obd->obd_olg.olg_cat_processing); + + OBD_FREE_LARGE(idarray, size); + RETURN(rc); } EXPORT_SYMBOL(llog_catalog_list);