X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdfilter%2Ffilter_lvb.c;h=1a614f24981fd637e731bdc2d656311bfb2fe996;hb=99c3dc10e445cfe299da07eec57eae04b9aa4347;hp=c66055e3b1322c1e4dc394a5060ac916b731277c;hpb=23fad25a5b6b1e468d05dc7e81dfb9ad00c86a16;p=fs%2Flustre-release.git diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c index c66055e..1a614f2 100644 --- a/lustre/obdfilter/filter_lvb.c +++ b/lustre/obdfilter/filter_lvb.c @@ -26,7 +26,7 @@ * 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. */ /* @@ -54,6 +54,18 @@ #include "filter_internal.h" +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_sem held */ static int filter_lvbo_init(struct ldlm_resource *res) { @@ -76,14 +88,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); - CDEBUG(D_INODE, "%s: filter_lvbo_init(o_gr="LPU64", o_id=" + 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], + dentry = filter_fid2dentry(obd, NULL, res->lr_name.name[1], res->lr_name.name[0]); if (IS_ERR(dentry)) { rc = PTR_ERR(dentry); @@ -103,6 +115,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); @@ -115,8 +129,8 @@ 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. */ @@ -126,12 +140,13 @@ static int filter_lvbo_update(struct ldlm_resource *res, 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"); @@ -173,62 +188,88 @@ static int filter_lvbo_update(struct ldlm_resource *res, 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; + + unlock_res(res); - if (i_size_read(dentry->d_inode) > lvb->lvb_size || !increase_only) { + 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 };