LU-15971 llite: implicit default LMV inherit

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

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index 1377697..235d25f 100644 (file)
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -691,6 +691,64 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump,
        RETURN(rc);
 }
 
+/* get default LMV from client cache */
+static int ll_dir_get_default_lmv(struct inode *inode, struct lmv_user_md *lum)
+{
+       struct ll_inode_info *lli = ll_i2info(inode);
+       const struct lmv_stripe_md *lsm;
+       bool fs_dmv_got = false;
+       int rc = -ENODATA;
+
+       ENTRY;
+retry:
+       if (lli->lli_default_lsm_md) {
+               down_read(&lli->lli_lsm_sem);
+               lsm = lli->lli_default_lsm_md;
+               if (lsm) {
+                       lum->lum_magic = lsm->lsm_md_magic;
+                       lum->lum_stripe_count = lsm->lsm_md_stripe_count;
+                       lum->lum_stripe_offset = lsm->lsm_md_master_mdt_index;
+                       lum->lum_hash_type = lsm->lsm_md_hash_type;
+                       lum->lum_max_inherit = lsm->lsm_md_max_inherit;
+                       lum->lum_max_inherit_rr = lsm->lsm_md_max_inherit_rr;
+                       rc = 0;
+               }
+               up_read(&lli->lli_lsm_sem);
+       }
+
+       if (rc == -ENODATA && !is_root_inode(inode) && !fs_dmv_got) {
+               lli = ll_i2info(inode->i_sb->s_root->d_inode);
+               fs_dmv_got = true;
+               goto retry;
+       }
+
+       if (!rc && fs_dmv_got) {
+               lli = ll_i2info(inode);
+               if (lum->lum_max_inherit != LMV_INHERIT_UNLIMITED) {
+                       if (lum->lum_max_inherit == LMV_INHERIT_NONE ||
+                           lum->lum_max_inherit < LMV_INHERIT_END ||
+                           lum->lum_max_inherit > LMV_INHERIT_MAX ||
+                           lum->lum_max_inherit <= lli->lli_dir_depth)
+                               GOTO(out, rc = -ENODATA);
+
+                       lum->lum_max_inherit -= lli->lli_dir_depth;
+               }
+
+               if (lum->lum_max_inherit_rr != LMV_INHERIT_RR_UNLIMITED) {
+                       if (lum->lum_max_inherit_rr == LMV_INHERIT_NONE ||
+                           lum->lum_max_inherit_rr < LMV_INHERIT_RR_END ||
+                           lum->lum_max_inherit_rr > LMV_INHERIT_RR_MAX ||
+                           lum->lum_max_inherit_rr <= lli->lli_dir_depth)
+                               lum->lum_max_inherit_rr = LMV_INHERIT_RR_NONE;
+
+                       if (lum->lum_max_inherit_rr > lli->lli_dir_depth)
+                               lum->lum_max_inherit_rr -= lli->lli_dir_depth;
+               }
+       }
+out:
+       RETURN(rc);
+}
+
 int ll_dir_get_default_layout(struct inode *inode, void **plmm, int *plmm_size,
                              struct ptlrpc_request **request, u64 valid,
                              enum get_default_layout_type type)
@@ -1658,7 +1716,6 @@ out:
                struct lmv_user_md __user *ulmv = uarg;
                struct lmv_user_md lum;
                struct ptlrpc_request *request = NULL;
-               struct ptlrpc_request *root_request = NULL;
                union lmv_mds_md *lmm = NULL;
                int lmmsize;
                u64 valid = 0;
@@ -1673,6 +1730,19 @@ out:
                if (copy_from_user(&lum, ulmv, sizeof(*ulmv)))
                        RETURN(-EFAULT);
 
+               /* get default LMV */
+               if (lum.lum_magic == LMV_USER_MAGIC &&
+                   lum.lum_type != LMV_TYPE_RAW) {
+                       rc = ll_dir_get_default_lmv(inode, &lum);
+                       if (rc)
+                               RETURN(rc);
+
+                       if (copy_to_user(ulmv, &lum, sizeof(lum)))
+                               RETURN(-EFAULT);
+
+                       RETURN(0);
+               }
+
                max_stripe_count = lum.lum_stripe_count;
                /* lum_magic will indicate which stripe the ioctl will like
                 * to get, LMV_MAGIC_V1 is for normal LMV stripe, LMV_USER_MAGIC
@@ -1685,61 +1755,14 @@ out:
                        RETURN(-EINVAL);
 
                rc = ll_dir_getstripe_default(inode, (void **)&lmm, &lmmsize,
-                                             &request, &root_request, valid);
+                                             &request, NULL, valid);
                if (rc != 0)
                        GOTO(finish_req, rc);
 
-               /* Get default LMV EA */
+               /* get default LMV in raw mode */
                if (lum.lum_magic == LMV_USER_MAGIC) {
-                       struct lmv_user_md *lum;
-                       struct ll_inode_info *lli;
-
-                       if (lmmsize > sizeof(*ulmv))
-                               GOTO(finish_req, rc = -EINVAL);
-
-                       lum = (struct lmv_user_md *)lmm;
-                       if (lum->lum_max_inherit == LMV_INHERIT_NONE)
-                               GOTO(finish_req, rc = -ENODATA);
-
-                       if (root_request != NULL) {
-                               lli = ll_i2info(inode);
-                               if (lum->lum_max_inherit !=
-                                   LMV_INHERIT_UNLIMITED) {
-                                       if (lum->lum_max_inherit <
-                                               LMV_INHERIT_END ||
-                                           lum->lum_max_inherit >
-                                               LMV_INHERIT_MAX ||
-                                           lum->lum_max_inherit <=
-                                               lli->lli_dir_depth)
-                                               GOTO(finish_req, rc = -ENODATA);
-
-                                       lum->lum_max_inherit -=
-                                               lli->lli_dir_depth;
-                               }
-
-                               if (lum->lum_max_inherit_rr !=
-                                       LMV_INHERIT_RR_UNLIMITED) {
-                                       if (lum->lum_max_inherit_rr ==
-                                               LMV_INHERIT_NONE ||
-                                           lum->lum_max_inherit_rr <
-                                               LMV_INHERIT_RR_END ||
-                                           lum->lum_max_inherit_rr >
-                                               LMV_INHERIT_RR_MAX ||
-                                           lum->lum_max_inherit_rr <=
-                                               lli->lli_dir_depth) {
-                                               lum->lum_max_inherit_rr =
-                                                       LMV_INHERIT_RR_NONE;
-                                               goto out_copy;
-                                       }
-
-                                       lum->lum_max_inherit_rr -=
-                                               lli->lli_dir_depth;
-                               }
-                       }
-out_copy:
                        if (copy_to_user(ulmv, lmm, lmmsize))
                                GOTO(finish_req, rc = -EFAULT);
-
                        GOTO(finish_req, rc);
                }
 
@@ -1818,7 +1841,6 @@ out_tmp:
                OBD_FREE(tmp, lum_size);
 finish_req:
                ptlrpc_req_finished(request);
-               ptlrpc_req_finished(root_request);
                return rc;
        }
        case LL_IOC_REMOVE_ENTRY: {