LU-5306: Update download and other whamcloud URLs

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

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 76e0f3b..d0b7708 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -214,7 +214,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
                                  OBD_CONNECT_MAX_EASIZE |
                                  OBD_CONNECT_FLOCK_DEAD |
                                  OBD_CONNECT_DISP_STRIPE | OBD_CONNECT_LFSCK |
-                                 OBD_CONNECT_OPEN_BY_FID;
+                                 OBD_CONNECT_OPEN_BY_FID |
+                                 OBD_CONNECT_DIR_STRIPE;
 
         if (sbi->ll_flags & LL_SBI_SOM_PREVIEW)
                 data->ocd_connect_flags |= OBD_CONNECT_SOM;
@@ -1377,12 +1378,11 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
                struct lmv_stripe_md    *old_lsm = lli->lli_lsm_md;
                int                     idx;
 
-               CERROR("%s: lmv layout mismatch "DFID"(%p)/"DFID"(%p)"
+               CERROR("%s: inode "DFID"(%p)'s lmv layout mismatch (%p)/(%p)"
                       "magic:0x%x/0x%x stripe count: %d/%d master_mdt: %d/%d"
                       "hash_type:0x%x/0x%x layout: 0x%x/0x%x pool:%s/%s\n",
-                      ll_get_fsname(inode->i_sb, NULL, 0),
-                      PFID(&lsm->lsm_md_master_fid), lsm,
-                      PFID(&old_lsm->lsm_md_master_fid), old_lsm,
+                      ll_get_fsname(inode->i_sb, NULL, 0), PFID(&lli->lli_fid),
+                      inode, lsm, old_lsm,
                       lsm->lsm_md_magic, old_lsm->lsm_md_magic,
                       lsm->lsm_md_stripe_count,
                       old_lsm->lsm_md_stripe_count,
@@ -2170,7 +2170,7 @@ void ll_delete_inode(struct inode *inode)
                spin_unlock_irq(&inode->i_data.tree_lock);
                 LASSERTF(inode->i_data.nrpages == 0,
                         "inode="DFID"(%p) nrpages=%lu, see "
-                        "http://jira.whamcloud.com/browse/LU-118\n",
+                        "https://jira.hpdd.intel.com/browse/LU-118\n",
                         PFID(ll_inode2fid(inode)), inode,
                          inode->i_data.nrpages);
         }
@@ -2586,9 +2586,11 @@ struct md_op_data * ll_prep_md_op_data(struct md_op_data *op_data,
        op_data->op_bias = 0;
        op_data->op_cli_flags = 0;
        if ((opc == LUSTRE_OPC_CREATE) && (name != NULL) &&
-            filename_is_volatile(name, namelen, NULL))
+            filename_is_volatile(name, namelen, &op_data->op_mds)) {
                op_data->op_bias |= MDS_CREATE_VOLATILE;
-       op_data->op_mds = 0;
+       } else {
+               op_data->op_mds = 0;
+       }
        op_data->op_data = data;
 
        /* When called by ll_setattr_raw, file is i1. */