X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdfilter%2Ffilter_lvb.c;h=a548983f251ac859da2a2ff6cdeb9b32e26ec586;hp=4235f8fe0aef4ffaa9dbfcf93a3ca9af8920c20c;hb=11c2c0ec77125041e9c8143a80e7e51aede653ea;hpb=70e80ade90af09300396706b8910e196a7928520 diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c index 4235f8f..a548983 100644 --- a/lustre/obdfilter/filter_lvb.c +++ b/lustre/obdfilter/filter_lvb.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -16,8 +14,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,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2004, 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/ @@ -42,9 +42,6 @@ #define DEBUG_SUBSYSTEM S_FILTER -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include @@ -54,7 +51,19 @@ #include "filter_internal.h" -/* Called with res->lr_lvb_sem held */ +static int filter_lvbo_free(struct ldlm_resource *res) { + if (res->lr_lvb_inode) { + iput(res->lr_lvb_inode); + res->lr_lvb_inode = NULL; + } + + if (res->lr_lvb_data) + OBD_FREE(res->lr_lvb_data, res->lr_lvb_len); + + return 0; +} + +/* Called with res->lr_lvb_mutex held */ static int filter_lvbo_init(struct ldlm_resource *res) { struct ost_lvb *lvb = NULL; @@ -64,7 +73,7 @@ static int filter_lvbo_init(struct ldlm_resource *res) ENTRY; LASSERT(res); - LASSERT_SEM_LOCKED(&res->lr_lvb_sem); + LASSERT_MUTEX_LOCKED(&res->lr_lvb_mutex); if (res->lr_lvb_data) RETURN(0); @@ -76,10 +85,14 @@ static int filter_lvbo_init(struct ldlm_resource *res) res->lr_lvb_data = lvb; res->lr_lvb_len = sizeof(*lvb); - obd = res->lr_namespace->ns_lvbp; + obd = ldlm_res_to_ns(res)->ns_lvbp; LASSERT(obd != NULL); - dentry = filter_fid2dentry(obd, NULL, res->lr_name.name[1], + 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); @@ -99,6 +112,8 @@ static int filter_lvbo_init(struct ldlm_resource *res) res->lr_name.name[0], lvb->lvb_size, lvb->lvb_mtime, lvb->lvb_blocks); + res->lr_lvb_inode = igrab(dentry->d_inode); + EXIT; out_dentry: f_dput(dentry); @@ -111,23 +126,24 @@ out_dentry: /* This will be called in two ways: * - * m != NULL : called by the DLM itself after a glimpse callback - * m == NULL : called by the filter after a disk write + * r != NULL : called by the DLM itself after a glimpse callback + * r == NULL : called by the filter after a disk write * * 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; struct obd_device *obd; - struct dentry *dentry; + struct inode *inode; + struct inode *tmpinode = NULL; ENTRY; LASSERT(res); - down(&res->lr_lvb_sem); + lock_res(res); lvb = res->lr_lvb_data; if (lvb == NULL) { CERROR("No lvb when running lvbo_update!\n"); @@ -135,11 +151,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; @@ -168,62 +185,88 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m, lvb->lvb_ctime, new->lvb_ctime); lvb->lvb_ctime = new->lvb_ctime; } + if (new->lvb_blocks > lvb->lvb_blocks || !increase_only) { + CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb blocks: " + LPU64" -> "LPU64"\n", res->lr_name.name[0], + lvb->lvb_blocks, new->lvb_blocks); + lvb->lvb_blocks = new->lvb_blocks; + } } disk_update: /* Update the LVB from the disk inode */ - obd = res->lr_namespace->ns_lvbp; + obd = ldlm_res_to_ns(res)->ns_lvbp; LASSERT(obd); - - 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)); - if (dentry->d_inode == NULL) - GOTO(out_dentry, rc = -ENOENT); + inode = res->lr_lvb_inode; + /* filter_fid2dentry could fail, esp. in OBD_FAIL_OST_ENOENT test case */ + if (unlikely(inode == NULL)) { + struct dentry *dentry; - if (i_size_read(dentry->d_inode) > lvb->lvb_size || !increase_only) { + unlock_res(res); + + dentry = filter_fid2dentry(obd, NULL, res->lr_name.name[1], + res->lr_name.name[0]); + if (IS_ERR(dentry)) + RETURN(PTR_ERR(dentry)); + + if (dentry->d_inode) + tmpinode = igrab(dentry->d_inode); + f_dput(dentry); + /* tmpinode could be NULL, but it does not matter if other + * have set res->lr_lvb_inode */ + lock_res(res); + if (res->lr_lvb_inode == NULL) { + res->lr_lvb_inode = tmpinode; + tmpinode = NULL; + } + inode = res->lr_lvb_inode; + } + + if (!inode || !inode->i_nlink) + GOTO(out, rc = -ENOENT); + + if (i_size_read(inode) > lvb->lvb_size || !increase_only) { CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb size from disk: " LPU64" -> %llu\n", res->lr_name.name[0], - lvb->lvb_size, i_size_read(dentry->d_inode)); - lvb->lvb_size = i_size_read(dentry->d_inode); + lvb->lvb_size, i_size_read(inode)); + lvb->lvb_size = i_size_read(inode); } - if (LTIME_S(dentry->d_inode->i_mtime) >lvb->lvb_mtime|| !increase_only){ + if (LTIME_S(inode->i_mtime) >lvb->lvb_mtime|| !increase_only){ CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb mtime from disk: " LPU64" -> %lu\n", res->lr_name.name[0], - lvb->lvb_mtime, LTIME_S(dentry->d_inode->i_mtime)); - lvb->lvb_mtime = LTIME_S(dentry->d_inode->i_mtime); + lvb->lvb_mtime, LTIME_S(inode->i_mtime)); + lvb->lvb_mtime = LTIME_S(inode->i_mtime); } - if (LTIME_S(dentry->d_inode->i_atime) >lvb->lvb_atime|| !increase_only){ + if (LTIME_S(inode->i_atime) >lvb->lvb_atime|| !increase_only){ CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb atime from disk: " LPU64" -> %lu\n", res->lr_name.name[0], - lvb->lvb_atime, LTIME_S(dentry->d_inode->i_atime)); - lvb->lvb_atime = LTIME_S(dentry->d_inode->i_atime); + lvb->lvb_atime, LTIME_S(inode->i_atime)); + lvb->lvb_atime = LTIME_S(inode->i_atime); } - if (LTIME_S(dentry->d_inode->i_ctime) >lvb->lvb_ctime|| !increase_only){ + if (LTIME_S(inode->i_ctime) >lvb->lvb_ctime|| !increase_only){ CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb ctime from disk: " LPU64" -> %lu\n", res->lr_name.name[0], - lvb->lvb_ctime, LTIME_S(dentry->d_inode->i_ctime)); - lvb->lvb_ctime = LTIME_S(dentry->d_inode->i_ctime); + lvb->lvb_ctime, LTIME_S(inode->i_ctime)); + lvb->lvb_ctime = LTIME_S(inode->i_ctime); } - if (lvb->lvb_blocks != dentry->d_inode->i_blocks) { + if (inode->i_blocks > lvb->lvb_blocks || !increase_only) { CDEBUG(D_DLMTRACE,"res: "LPU64" updating lvb blocks from disk: " 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; + lvb->lvb_blocks, (unsigned long long)inode->i_blocks); + lvb->lvb_blocks = inode->i_blocks; } -out_dentry: - f_dput(dentry); - out: - up(&res->lr_lvb_sem); + unlock_res(res); + if (tmpinode) + iput(tmpinode); return rc; } struct ldlm_valblock_ops filter_lvbo = { lvbo_init: filter_lvbo_init, - lvbo_update: filter_lvbo_update + lvbo_update: filter_lvbo_update, + lvbo_free: filter_lvbo_free };