X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdfilter%2Ffilter_lvb.c;h=08c41e23cafbc0597ee6e572db1cbfa82b668220;hp=43c69b1eec3f150bcf75188511a0aeaa72ebb21e;hb=a6527b28ba2082a445fbf584909a7791ce407ef3;hpb=eef822668e9c4794fc5f06747e03985518fa1d19 diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c index 43c69b1..08c41e2 100644 --- a/lustre/obdfilter/filter_lvb.c +++ b/lustre/obdfilter/filter_lvb.c @@ -1,30 +1,43 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * linux/fs/obdfilter/filter_log.c + * GPL HEADER START * - * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Author: Peter Braam - * Author: Andreas Dilger - * Author: Phil Schwan + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * 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. * - * 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 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). * - * 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. + * 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 * - * 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. + * 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) 2004, 2010, Oracle and/or its affiliates. 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. + * + * lustre/obdfilter/filter_lvb.c + * + * Author: Peter Braam + * Author: Andreas Dilger + * Author: Phil Schwan */ #define DEBUG_SUBSYSTEM S_FILTER @@ -53,11 +66,6 @@ static int filter_lvbo_init(struct ldlm_resource *res) LASSERT(res); LASSERT_SEM_LOCKED(&res->lr_lvb_sem); - /* we only want lvb's for object resources */ - /* check for internal locks: these have name[1] != 0 */ - if (res->lr_name.name[1]) - RETURN(0); - if (res->lr_lvb_data) RETURN(0); @@ -71,7 +79,11 @@ static int filter_lvbo_init(struct ldlm_resource *res) obd = res->lr_namespace->ns_lvbp; LASSERT(obd != NULL); - dentry = filter_fid2dentry(obd, NULL, res->lr_name.name[2], + CDEBUG(D_INODE, "%s: filter_lvbo_init(o_seq="LPU64", o_id=" + LPU64")\n", obd->obd_name, res->lr_name.name[1], + res->lr_name.name[0]); + + dentry = filter_fid2dentry(obd, NULL, res->lr_name.name[1], res->lr_name.name[0]); if (IS_ERR(dentry)) { rc = PTR_ERR(dentry); @@ -86,8 +98,8 @@ static int filter_lvbo_init(struct ldlm_resource *res) inode_init_lvb(dentry->d_inode, lvb); - CDEBUG(D_DLMTRACE, "res: "LPU64" initial lvb size: "LPU64", " - "mtime: "LPU64", blocks: "LPU64"\n", + CDEBUG(D_DLMTRACE, "res: "LPX64" initial lvb size: "LPX64", " + "mtime: "LPX64", blocks: "LPX64"\n", res->lr_name.name[0], lvb->lvb_size, lvb->lvb_mtime, lvb->lvb_blocks); @@ -95,6 +107,8 @@ static int filter_lvbo_init(struct ldlm_resource *res) out_dentry: f_dput(dentry); + if (rc) + OST_LVB_SET_ERR(lvb->lvb_blocks, rc); /* Don't free lvb data on lookup error */ return rc; } @@ -106,8 +120,8 @@ out_dentry: * * If 'increase_only' is true, don't allow values to move backwards. */ -static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m, - int buf_idx, int increase_only) +static int filter_lvbo_update(struct ldlm_resource *res, + struct ptlrpc_request *r, int increase_only) { int rc = 0; struct ost_lvb *lvb; @@ -117,12 +131,7 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m, LASSERT(res); - /* we only want lvb's for object resources */ - /* check for internal locks: these have name[1] != 0 */ - if (res->lr_name.name[1]) - RETURN(0); - - down(&res->lr_lvb_sem); + cfs_down(&res->lr_lvb_sem); lvb = res->lr_lvb_data; if (lvb == NULL) { CERROR("No lvb when running lvbo_update!\n"); @@ -130,11 +139,12 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m, } /* Update the LVB from the network message */ - if (m != NULL) { + if (r != NULL) { struct ost_lvb *new; - new = lustre_swab_buf(m, buf_idx, sizeof(*new), - lustre_swab_ost_lvb); + /* XXX update always from reply buffer */ + new = req_capsule_server_get(&r->rq_pill, &RMF_DLM_LVB); + if (new == NULL) { CERROR("lustre_swab_buf failed\n"); goto disk_update; @@ -170,7 +180,7 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m, obd = res->lr_namespace->ns_lvbp; LASSERT(obd); - dentry = filter_fid2dentry(obd, NULL, res->lr_name.name[2], + dentry = filter_fid2dentry(obd, NULL, res->lr_name.name[1], res->lr_name.name[0]); if (IS_ERR(dentry)) GOTO(out, rc = PTR_ERR(dentry)); @@ -205,8 +215,8 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m, } if (lvb->lvb_blocks != dentry->d_inode->i_blocks) { CDEBUG(D_DLMTRACE,"res: "LPU64" updating lvb blocks from disk: " - LPU64" -> %lu\n", res->lr_name.name[0], - lvb->lvb_blocks, dentry->d_inode->i_blocks); + LPU64" -> %llu\n", res->lr_name.name[0], + lvb->lvb_blocks, (unsigned long long)dentry->d_inode->i_blocks); lvb->lvb_blocks = dentry->d_inode->i_blocks; } @@ -214,7 +224,7 @@ out_dentry: f_dput(dentry); out: - up(&res->lr_lvb_sem); + cfs_up(&res->lr_lvb_sem); return rc; }