LU-10092 First phase of persistent client cache project merging

Merge remote-tracking branch 'origin/pcc'

Change-Id: I87a681c54712926d336c983dd8e56b58ebf4b612
Signed-off-by: Oleg Drokin <green@whamcloud.com>

diff --cc lustre/autoconf/lustre-core.m4
Simple merge

diff --cc lustre/include/md_object.h
Simple merge

diff --cc lustre/include/obd.h
Simple merge

diff --cc lustre/include/uapi/linux/lustre/lustre_idl.h
Simple merge

diff --cc lustre/llite/dir.c
Simple merge

diff --cc lustre/llite/file.c
Simple merge

diff --cc lustre/llite/llite_internal.h
Simple merge

diff --cc lustre/llite/llite_lib.c
Simple merge

diff --cc lustre/llite/namei.c
Simple merge

diff --cc lustre/llite/super25.c
index 5158d0a,a6fef2e..c2e88cc
--- 1/lustre/llite/super25.c
--- 2/lustre/llite/super25.c
+++ b/lustre/llite/super25.c
@@@ -177,15 -184,9 +184,16 @@@ static void __exit lustre_exit(void
        cl_env_put(cl_inode_fini_env, &cl_inode_fini_refcheck);
        vvp_global_fini();
  
 +#ifdef HAVE_INODE_I_RCU
 +      /*
 +       * Make sure all delayed rcu free inodes are flushed before we
 +       * destroy cache.
 +       */
 +      rcu_barrier();
 +#endif
        kmem_cache_destroy(ll_inode_cachep);
        kmem_cache_destroy(ll_file_data_slab);
+       kmem_cache_destroy(pcc_inode_slab);
  }
  
  MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");

diff --cc lustre/lmv/lmv_intent.c
index a7a1903,50ac0de..92a2ff4
--- 1/lustre/lmv/lmv_intent.c
--- 2/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@@ -350,13 -352,14 +350,14 @@@ retry
                if (IS_ERR(tgt))
                        RETURN(PTR_ERR(tgt));
  
 -              op_data->op_mds = tgt->ltd_idx;
 +              op_data->op_mds = tgt->ltd_index;
        } else {
                LASSERT(fid_is_sane(&op_data->op_fid1));
-               LASSERT(fid_is_zero(&op_data->op_fid2));
+               LASSERT(it->it_flags & MDS_OPEN_PCC ||
+                       fid_is_zero(&op_data->op_fid2));
                LASSERT(op_data->op_name != NULL);
  
 -              tgt = lmv_locate_tgt(lmv, op_data, &op_data->op_fid1);
 +              tgt = lmv_locate_tgt(lmv, op_data);
                if (IS_ERR(tgt))
                        RETURN(PTR_ERR(tgt));
        }

diff --cc lustre/lmv/lmv_obd.c
Simple merge

diff --cc lustre/mdd/mdd_dir.c
Simple merge

diff --cc lustre/utils/lfs.c
Simple merge