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 2befb63..e1f8eda 100644 (file)
--- a/lustre/include/lustre_dlm.h
+++ b/lustre/include/lustre_dlm.h
@@ -368,6 +368,7 @@ struct ldlm_valblock_ops {
         int (*lvbo_init)(struct ldlm_resource *res);
         int (*lvbo_update)(struct ldlm_resource *res, struct ptlrpc_request *r,
                            int buf_idx, int increase);
+        int (*lvbo_free)(struct ldlm_resource *res);
 };
 
 typedef enum {
@@ -608,6 +609,8 @@ struct ldlm_resource {
 
         /* when the resource was considered as contended */
         cfs_time_t             lr_contention_time;
+
+        struct inode          *lr_lvb_inode;
 };
 
 struct ldlm_ast_work {

diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index 46a3666..62a285e 100644 (file)
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -950,11 +950,9 @@ void __ldlm_resource_putref_final(struct ldlm_resource *res)
                 wake_up(&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,
@@ -964,39 +962,35 @@ int ldlm_resource_putref(struct ldlm_resource *res)
         LASSERTF(atomic_read(&res->lr_refcount) < LI_POISON, "%d",
                  atomic_read(&res->lr_refcount));
 
-        if (atomic_dec_and_lock(&res->lr_refcount, &ns->ns_hash_lock)) {
-                __ldlm_resource_putref_final(res);
+        if (locked && !atomic_dec_and_test(&res->lr_refcount))
+                RETURN(0);
+        if (!locked && !atomic_dec_and_lock(&res->lr_refcount,
+                                            &ns->ns_hash_lock))
+                RETURN(0);
+
+        __ldlm_resource_putref_final(res);
+
+        if (!locked)
                 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);
+
+        LASSERT(res->lr_lvb_inode == NULL);
+
+        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,
-               atomic_read(&res->lr_refcount) - 1);
-        LASSERT(atomic_read(&res->lr_refcount) > 0);
-        LASSERT(atomic_read(&res->lr_refcount) < LI_POISON);
-
-        LASSERT(atomic_read(&res->lr_refcount) >= 0);
-        if (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, struct list_head *head,

diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c
index 8a18a7e..2f88361 100644 (file)
--- 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)
 {
@@ -102,6 +114,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);
@@ -125,7 +139,7 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct ptlrpc_request *
         int rc = 0;
         struct ost_lvb *lvb;
         struct obd_device *obd;
-        struct dentry *dentry;
+        struct inode *inode;
         ENTRY;
 
         LASSERT(res);
@@ -179,48 +193,54 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct ptlrpc_request *
         obd = res->lr_namespace->ns_lvbp;
         LASSERT(obd);
 
-        dentry = filter_fid2dentry(obd, NULL, 0, res->lr_name.name[0]);
-        if (IS_ERR(dentry))
-                GOTO(out, rc = PTR_ERR(dentry));
+        inode = res->lr_lvb_inode;
+        /* filter_fid2dentry could fail */
+        if (unlikely(!inode)) {
+                struct dentry *dentry;
+
+                dentry = filter_fid2dentry(obd, NULL, 0, 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 (dentry->d_inode == NULL)
-                GOTO(out_dentry, rc = -ENOENT);
+        if (!inode || !inode->i_nlink)
+                GOTO(out, rc = -ENOENT);
 
-        if (i_size_read(dentry->d_inode) > lvb->lvb_size || !increase_only) {
+        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" -> "LPU64"\n", res->lr_name.name[0],
-                       lvb->lvb_blocks, (__u64)dentry->d_inode->i_blocks);
-                lvb->lvb_blocks = dentry->d_inode->i_blocks;
+                       lvb->lvb_blocks, (__u64)inode->i_blocks);
+                lvb->lvb_blocks = inode->i_blocks;
         }
 
-out_dentry:
-        f_dput(dentry);
-
 out:
         up(&res->lr_lvb_sem);
         return rc;
@@ -228,5 +248,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
 };