LU-10092 First phase of persistent client cache project merging

[fs/lustre-release.git] / lustre / llite / llite_lib.c

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 0ce8f2e..4a94d99 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -976,7 +976,6 @@ void ll_lli_init(struct ll_inode_info *lli)
                spin_lock_init(&lli->lli_sa_lock);
                lli->lli_opendir_pid = 0;
                lli->lli_sa_enabled = 0;
-               lli->lli_def_stripe_offset = -1;
                init_rwsem(&lli->lli_lsm_sem);
        } else {
                mutex_init(&lli->lli_size_mutex);
@@ -1305,10 +1304,15 @@ void ll_dir_clear_lsm_md(struct inode *inode)
 
        LASSERT(S_ISDIR(inode->i_mode));
 
-       if (lli->lli_lsm_md != NULL) {
+       if (lli->lli_lsm_md) {
                lmv_free_memmd(lli->lli_lsm_md);
                lli->lli_lsm_md = NULL;
        }
+
+       if (lli->lli_default_lsm_md) {
+               lmv_free_memmd(lli->lli_default_lsm_md);
+               lli->lli_default_lsm_md = NULL;
+       }
 }
 
 static struct inode *ll_iget_anon_dir(struct super_block *sb,
@@ -1377,6 +1381,9 @@ static int ll_init_lsm_md(struct inode *inode, struct lustre_md *md)
               ll_i2sbi(inode)->ll_fsname, PFID(&lli->lli_fid));
        lsm_md_dump(D_INODE, lsm);
 
+       if (!lmv_dir_striped(lsm))
+               goto out;
+
        /* XXX sigh, this lsm_root initialization should be in
         * LMV layer, but it needs ll_iget right now, so we
         * put this here right now. */
@@ -1404,12 +1411,52 @@ static int ll_init_lsm_md(struct inode *inode, struct lustre_md *md)
                        return rc;
                }
        }
-
+out:
        lli->lli_lsm_md = lsm;
 
        return 0;
 }
 
+static void ll_update_default_lsm_md(struct inode *inode, struct lustre_md *md)
+{
+       struct ll_inode_info *lli = ll_i2info(inode);
+
+       if (!md->default_lmv) {
+               /* clear default lsm */
+               if (lli->lli_default_lsm_md) {
+                       down_write(&lli->lli_lsm_sem);
+                       if (lli->lli_default_lsm_md) {
+                               lmv_free_memmd(lli->lli_default_lsm_md);
+                               lli->lli_default_lsm_md = NULL;
+                       }
+                       up_write(&lli->lli_lsm_sem);
+               }
+       } else if (lli->lli_default_lsm_md) {
+               /* update default lsm if it changes */
+               down_read(&lli->lli_lsm_sem);
+               if (lli->lli_default_lsm_md &&
+                   !lsm_md_eq(lli->lli_default_lsm_md, md->default_lmv)) {
+                       up_read(&lli->lli_lsm_sem);
+                       down_write(&lli->lli_lsm_sem);
+                       if (lli->lli_default_lsm_md)
+                               lmv_free_memmd(lli->lli_default_lsm_md);
+                       lli->lli_default_lsm_md = md->default_lmv;
+                       lsm_md_dump(D_INODE, md->default_lmv);
+                       md->default_lmv = NULL;
+                       up_write(&lli->lli_lsm_sem);
+               } else {
+                       up_read(&lli->lli_lsm_sem);
+               }
+       } else {
+               /* init default lsm */
+               down_write(&lli->lli_lsm_sem);
+               lli->lli_default_lsm_md = md->default_lmv;
+               lsm_md_dump(D_INODE, md->default_lmv);
+               md->default_lmv = NULL;
+               up_write(&lli->lli_lsm_sem);
+       }
+}
+
 static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
 {
        struct ll_inode_info *lli = ll_i2info(inode);
@@ -1422,6 +1469,10 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
        CDEBUG(D_INODE, "update lsm %p of "DFID"\n", lli->lli_lsm_md,
               PFID(ll_inode2fid(inode)));
 
+       /* update default LMV */
+       if (md->default_lmv)
+               ll_update_default_lsm_md(inode, md);
+
        /*
         * no striped information from request, lustre_md from req does not
         * include stripeEA, see ll_md_setattr()
@@ -1444,10 +1495,9 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
         *
         * foreign LMV should not change.
         */
-       if (lli->lli_lsm_md &&
-           lli->lli_lsm_md->lsm_md_magic != LMV_MAGIC_FOREIGN &&
-          !lsm_md_eq(lli->lli_lsm_md, lsm)) {
-               if (lsm->lsm_md_layout_version <=
+       if (lli->lli_lsm_md && !lsm_md_eq(lli->lli_lsm_md, lsm)) {
+               if (lmv_dir_striped(lli->lli_lsm_md) &&
+                   lsm->lsm_md_layout_version <=
                    lli->lli_lsm_md->lsm_md_layout_version) {
                        CERROR("%s: "DFID" dir layout mismatch:\n",
                               ll_i2sbi(inode)->ll_fsname,
@@ -1467,15 +1517,6 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
        if (!lli->lli_lsm_md) {
                struct cl_attr  *attr;
 
-               if (lsm->lsm_md_magic == LMV_MAGIC_FOREIGN) {
-                       /* set md->lmv to NULL, so the following free lustre_md
-                        * will not free this lsm */
-                       md->lmv = NULL;
-                       lli->lli_lsm_md = lsm;
-                       up_write(&lli->lli_lsm_sem);
-                       RETURN(0);
-               }
-
                rc = ll_init_lsm_md(inode, md);
                up_write(&lli->lli_lsm_sem);
                if (rc != 0)
@@ -1491,6 +1532,9 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
                 */
                down_read(&lli->lli_lsm_sem);
 
+               if (!lmv_dir_striped(lli->lli_lsm_md))
+                       GOTO(unlock, rc);
+
                OBD_ALLOC_PTR(attr);
                if (attr == NULL)
                        GOTO(unlock, rc = -ENOMEM);
@@ -2454,7 +2498,9 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
 {
        struct ll_sb_info *sbi = NULL;
        struct lustre_md md = { NULL };
+       bool default_lmv_deleted = false;
        int rc;
+
        ENTRY;
 
        LASSERT(*inode || sb);
@@ -2464,6 +2510,15 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
        if (rc != 0)
                GOTO(out, rc);
 
+       /*
+        * clear default_lmv only if intent_getattr reply doesn't contain it.
+        * but it needs to be done after iget, check this early because
+        * ll_update_lsm_md() may change md.
+        */
+       if (it && (it->it_op & (IT_LOOKUP | IT_GETATTR)) &&
+           S_ISDIR(md.body->mbo_mode) && !md.default_lmv)
+               default_lmv_deleted = true;
+
        if (*inode) {
                rc = ll_update_inode(*inode, &md);
                if (rc != 0)
@@ -2527,6 +2582,9 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
                LDLM_LOCK_PUT(lock);
        }
 
+       if (default_lmv_deleted)
+               ll_update_default_lsm_md(*inode, &md);
+
        GOTO(out, rc = 0);
 
 out:
@@ -2603,7 +2661,8 @@ void ll_unlock_md_op_lsm(struct md_op_data *op_data)
 struct md_op_data *ll_prep_md_op_data(struct md_op_data *op_data,
                                      struct inode *i1, struct inode *i2,
                                      const char *name, size_t namelen,
-                                     __u32 mode, __u32 opc, void *data)
+                                     __u32 mode, enum md_op_code opc,
+                                     void *data)
 {
        LASSERT(i1 != NULL);
 
@@ -2627,15 +2686,13 @@ struct md_op_data *ll_prep_md_op_data(struct md_op_data *op_data,
 
        ll_i2gids(op_data->op_suppgids, i1, i2);
        op_data->op_fid1 = *ll_inode2fid(i1);
-       op_data->op_default_stripe_offset = -1;
+       op_data->op_code = opc;
 
        if (S_ISDIR(i1->i_mode)) {
                down_read(&ll_i2info(i1)->lli_lsm_sem);
                op_data->op_mea1_sem = &ll_i2info(i1)->lli_lsm_sem;
                op_data->op_mea1 = ll_i2info(i1)->lli_lsm_md;
-               if (opc == LUSTRE_OPC_MKDIR)
-                       op_data->op_default_stripe_offset =
-                                  ll_i2info(i1)->lli_def_stripe_offset;
+               op_data->op_default_mea1 = ll_i2info(i1)->lli_default_lsm_md;
        }
 
        if (i2) {