landing b_cmobd_merge on HEAD

[fs/lustre-release.git] / lustre / obdfilter / filter_lvb.c

diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c
index f86d1bf..599eeab 100644 (file)
--- a/lustre/obdfilter/filter_lvb.c
+++ b/lustre/obdfilter/filter_lvb.c
@@ -39,9 +39,9 @@
 static int filter_lvbo_init(struct ldlm_resource *res)
 {
         int rc = 0;
+        struct obdo *oa = NULL;
         struct ost_lvb *lvb = NULL;
         struct obd_device *obd;
-        struct obdo *oa = NULL;
         struct dentry *dentry;
         ENTRY;
 
@@ -85,17 +85,17 @@ static int filter_lvbo_init(struct ldlm_resource *res)
 
         lvb->lvb_size = dentry->d_inode->i_size;
         lvb->lvb_mtime = LTIME_S(dentry->d_inode->i_mtime);
-        CDEBUG(D_DLMTRACE, "res: "LPU64" initial lvb size: "LPU64", mtime: "
-               LPU64"\n", res->lr_name.name[0], lvb->lvb_size, lvb->lvb_mtime);
+        lvb->lvb_blocks = dentry->d_inode->i_blocks;
+
+        CDEBUG(D_DLMTRACE, "res: "LPU64" initial lvb size: "LPU64", "
+               "mtime: "LPU64", blocks: "LPU64"\n",
+               res->lr_name.name[0], lvb->lvb_size,
+               lvb->lvb_mtime, lvb->lvb_blocks);
 
  out:
         if (oa)
                 obdo_free(oa);
-        if (rc && lvb != NULL) {
-                OBD_FREE(lvb, sizeof(*lvb));
-                res->lr_lvb_data = NULL;
-                res->lr_lvb_len = 0;
-        }
+        /* Don't free lvb data on lookup error */
         up(&res->lr_lvb_sem);
         return rc;
 }
@@ -111,9 +111,9 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m,
                               int buf_idx, int increase)
 {
         int rc = 0;
+        struct obdo *oa = NULL;
         struct ost_lvb *lvb = res->lr_lvb_data;
         struct obd_device *obd;
-        struct obdo *oa = NULL;
         struct dentry *dentry;
         ENTRY;
 
@@ -153,6 +153,12 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m,
                                lvb->lvb_mtime, new->lvb_mtime);
                         lvb->lvb_mtime = new->lvb_mtime;
                 }
+                if (new->lvb_blocks > lvb->lvb_blocks || !increase) {
+                        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;
+                }
                 GOTO(out, rc = 0);
         }
 
@@ -181,23 +187,26 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m,
                        lvb->lvb_size, dentry->d_inode->i_size);
                 lvb->lvb_size = dentry->d_inode->i_size;
         }
+
         if (LTIME_S(dentry->d_inode->i_mtime) > lvb->lvb_mtime || !increase) {
                 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);
         }
-        f_dput(dentry);
+        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);
+        lvb->lvb_blocks = dentry->d_inode->i_blocks;
 
- out:
-        if (oa != NULL)
+        f_dput(dentry);
+out:
+        if (oa)
                 obdo_free(oa);
         up(&res->lr_lvb_sem);
         return rc;
 }
 
-
-
 struct ldlm_valblock_ops filter_lvbo = {
         lvbo_init: filter_lvbo_init,
         lvbo_update: filter_lvbo_update