LU-11213 ptlrpc: intent_getattr fetches default LMV

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

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 80bfd7b..27e7bff 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -256,8 +256,6 @@ void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel)
        }
 
        if (bits & MDS_INODELOCK_XATTR) {
-               if (S_ISDIR(inode->i_mode))
-                       ll_i2info(inode)->lli_def_stripe_offset = -1;
                ll_xattr_cache_destroy(inode);
                bits &= ~MDS_INODELOCK_XATTR;
        }
@@ -1271,13 +1269,11 @@ again:
                        from_kuid(&init_user_ns, current_fsuid()),
                        from_kgid(&init_user_ns, current_fsgid()),
                        cfs_curproc_cap_pack(), rdev, &request);
-       if (err < 0 && err != -EREMOTE)
-               GOTO(err_exit, err);
-
-       /* If the client doesn't know where to create a subdirectory (or
-        * in case of a race that sends the RPC to the wrong MDS), the
-        * MDS will return -EREMOTE and the client will fetch the layout
-        * of the directory, then create the directory on the right MDT. */
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 14, 58, 0)
+       /*
+        * server < 2.12.58 doesn't pack default LMV in intent_getattr reply,
+        * fetch default LMV here.
+        */
        if (unlikely(err == -EREMOTE)) {
                struct ll_inode_info    *lli = ll_i2info(dir);
                struct lmv_user_md      *lum;
@@ -1289,24 +1285,54 @@ again:
 
                err2 = ll_dir_getstripe(dir, (void **)&lum, &lumsize, &request,
                                        OBD_MD_DEFAULT_MEA);
+               ll_finish_md_op_data(op_data);
+               op_data = NULL;
                if (err2 == 0) {
-                       /* Update stripe_offset and retry */
-                       lli->lli_def_stripe_offset = lum->lum_stripe_offset;
-               } else if (err2 == -ENODATA &&
-                          lli->lli_def_stripe_offset != -1) {
-                       /* If there are no default stripe EA on the MDT, but the
+                       struct lustre_md md = { NULL };
+
+                       md.body = req_capsule_server_get(&request->rq_pill,
+                                                        &RMF_MDT_BODY);
+                       if (!md.body)
+                               GOTO(err_exit, err = -EPROTO);
+
+                       OBD_ALLOC_PTR(md.default_lmv);
+                       if (!md.default_lmv)
+                               GOTO(err_exit, err = -ENOMEM);
+
+                       md.default_lmv->lsm_md_magic = lum->lum_magic;
+                       md.default_lmv->lsm_md_stripe_count =
+                               lum->lum_stripe_count;
+                       md.default_lmv->lsm_md_master_mdt_index =
+                               lum->lum_stripe_offset;
+                       md.default_lmv->lsm_md_hash_type = lum->lum_hash_type;
+
+                       err = ll_update_inode(dir, &md);
+                       md_free_lustre_md(sbi->ll_md_exp, &md);
+                       if (err)
+                               GOTO(err_exit, err);
+               } else if (err2 == -ENODATA && lli->lli_default_lsm_md) {
+                       /*
+                        * If there are no default stripe EA on the MDT, but the
                         * client has default stripe, then it probably means
-                        * default stripe EA has just been deleted. */
-                       lli->lli_def_stripe_offset = -1;
+                        * default stripe EA has just been deleted.
+                        */
+                       down_write(&lli->lli_lsm_sem);
+                       if (lli->lli_default_lsm_md)
+                               OBD_FREE_PTR(lli->lli_default_lsm_md);
+                       lli->lli_default_lsm_md = NULL;
+                       up_write(&lli->lli_lsm_sem);
                } else {
                        GOTO(err_exit, err);
                }
 
                ptlrpc_req_finished(request);
                request = NULL;
-               ll_finish_md_op_data(op_data);
                goto again;
        }
+#endif
+
+       if (err < 0)
+               GOTO(err_exit, err);
 
        ll_update_times(request, dir);