From: Andrew Perepechko Date: Mon, 16 Aug 2010 21:42:10 +0000 (+0400) Subject: b=22107 pin object's inode in memory to avoid certain timeouts X-Git-Tag: 2.0.51.0~70 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=fc4a1bd60f60ce9fd69f09947adba4a52d30b1e7 b=22107 pin object's inode in memory to avoid certain timeouts i=Andreas Dilger i=Johann Lombardi --- diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h index d6d3c73..1747a77 100644 --- a/lustre/include/lustre_dlm.h +++ b/lustre/include/lustre_dlm.h @@ -373,6 +373,7 @@ struct ldlm_valblock_ops { int (*lvbo_update)(struct ldlm_resource *res, struct ptlrpc_request *r, int increase); + int (*lvbo_free)(struct ldlm_resource *res); }; typedef enum { @@ -768,6 +769,8 @@ struct ldlm_resource { * List of references to this resource. For debugging. */ struct lu_ref lr_reference; + + struct inode *lr_lvb_inode; }; struct ldlm_ast_work { diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c index b10c4b5..6d0d4a1 100644 --- a/lustre/ldlm/ldlm_resource.c +++ b/lustre/ldlm/ldlm_resource.c @@ -988,11 +988,9 @@ void __ldlm_resource_putref_final(struct ldlm_resource *res) cfs_waitq_signal(&ns->ns_waitq); } -/* Returns 1 if the resource was freed, 0 if it remains. */ -int ldlm_resource_putref(struct ldlm_resource *res) +int ldlm_resource_putref_internal(struct ldlm_resource *res, int locked) { struct ldlm_namespace *ns = res->lr_namespace; - int rc = 0; ENTRY; CDEBUG(D_INFO, "putref res: %p count: %d\n", res, @@ -1002,39 +1000,33 @@ int ldlm_resource_putref(struct ldlm_resource *res) LASSERTF(cfs_atomic_read(&res->lr_refcount) < LI_POISON, "%d", cfs_atomic_read(&res->lr_refcount)); - if (cfs_atomic_dec_and_lock(&res->lr_refcount, &ns->ns_hash_lock)) { - __ldlm_resource_putref_final(res); + if (locked && !cfs_atomic_dec_and_test(&res->lr_refcount)) + RETURN(0); + if (!locked && !cfs_atomic_dec_and_lock(&res->lr_refcount, + &ns->ns_hash_lock)) + RETURN(0); + + __ldlm_resource_putref_final(res); + + if (!locked) cfs_spin_unlock(&ns->ns_hash_lock); - if (res->lr_lvb_data) - OBD_FREE(res->lr_lvb_data, res->lr_lvb_len); - OBD_SLAB_FREE(res, ldlm_resource_slab, sizeof *res); - rc = 1; - } - RETURN(rc); + if (ns->ns_lvbo && ns->ns_lvbo->lvbo_free) + ns->ns_lvbo->lvbo_free(res); + + OBD_SLAB_FREE(res, ldlm_resource_slab, sizeof *res); + + RETURN(1); } -/* Returns 1 if the resource was freed, 0 if it remains. */ -int ldlm_resource_putref_locked(struct ldlm_resource *res) +int ldlm_resource_putref(struct ldlm_resource *res) { - int rc = 0; - ENTRY; - - CDEBUG(D_INFO, "putref res: %p count: %d\n", res, - cfs_atomic_read(&res->lr_refcount) - 1); - LASSERT(cfs_atomic_read(&res->lr_refcount) > 0); - LASSERT(cfs_atomic_read(&res->lr_refcount) < LI_POISON); - - LASSERT(cfs_atomic_read(&res->lr_refcount) >= 0); - if (cfs_atomic_dec_and_test(&res->lr_refcount)) { - __ldlm_resource_putref_final(res); - if (res->lr_lvb_data) - OBD_FREE(res->lr_lvb_data, res->lr_lvb_len); - OBD_SLAB_FREE(res, ldlm_resource_slab, sizeof *res); - rc = 1; - } + return ldlm_resource_putref_internal(res, 0); +} - RETURN(rc); +int ldlm_resource_putref_locked(struct ldlm_resource *res) +{ + return ldlm_resource_putref_internal(res, 1); } void ldlm_resource_add_lock(struct ldlm_resource *res, cfs_list_t *head, diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c index 08c41e2..b223812 100644 --- a/lustre/obdfilter/filter_lvb.c +++ b/lustre/obdfilter/filter_lvb.c @@ -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) { @@ -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); @@ -126,7 +140,7 @@ 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; ENTRY; LASSERT(res); @@ -179,50 +193,57 @@ static int filter_lvbo_update(struct ldlm_resource *res, /* Update the LVB from the disk inode */ obd = res->lr_namespace->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 */ + if (unlikely(!inode)) { + struct dentry *dentry; + + 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) + inode = res->lr_lvb_inode = igrab(dentry->d_inode); + f_dput(dentry); + } - if (i_size_read(dentry->d_inode) > lvb->lvb_size || !increase_only) { + 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 (lvb->lvb_blocks != inode->i_blocks) { 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: cfs_up(&res->lr_lvb_sem); return rc; @@ -230,5 +251,6 @@ out: 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 };