Whamcloud - gitweb
LU-12355 llite: MS_* flags and SB_* flags split
[fs/lustre-release.git] / lustre / llite / namei.c
index b3780e2..8b519ff 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
 #include <linux/security.h>
+#include <linux/user_namespace.h>
+#ifdef HAVE_UIDGID_HEADER
+# include <linux/uidgid.h>
+#endif
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
 #include <obd_support.h>
 #include <lustre_fid.h>
-#include <lustre_lite.h>
 #include <lustre_dlm.h>
-#include <lustre_ver.h>
 #include "llite_internal.h"
 
-static int ll_create_it(struct inode *, struct dentry *,
-                       int, struct lookup_intent *);
-
-/*
- * Check if we have something mounted at the named dchild.
- * In such a case there would always be dentry present.
- */
-static int ll_d_mountpoint(struct dentry *dparent, struct dentry *dchild,
-                           struct qstr *name)
-{
-        int mounted = 0;
-
-        if (unlikely(dchild)) {
-                mounted = d_mountpoint(dchild);
-        } else if (dparent) {
-                dchild = d_lookup(dparent, name);
-                if (dchild) {
-                        mounted = d_mountpoint(dchild);
-                        dput(dchild);
-                }
-        }
-        return mounted;
-}
-
-int ll_unlock(__u32 mode, struct lustre_handle *lockh)
-{
-        ENTRY;
-
-        ldlm_lock_decref(lockh, mode);
-
-        RETURN(0);
-}
-
+static int ll_create_it(struct inode *dir, struct dentry *dentry,
+                       struct lookup_intent *it,
+                       void *secctx, __u32 secctxlen);
 
 /* called from iget5_locked->find_inode() under inode_lock spinlock */
 static int ll_test_inode(struct inode *inode, void *opaque)
 {
-        struct ll_inode_info *lli = ll_i2info(inode);
-        struct lustre_md     *md = opaque;
+       struct ll_inode_info    *lli = ll_i2info(inode);
+       struct lustre_md        *md = opaque;
 
-        if (unlikely(!(md->body->valid & OBD_MD_FLID))) {
-                CERROR("MDS body missing FID\n");
-                return 0;
-        }
+       if (unlikely(!(md->body->mbo_valid & OBD_MD_FLID))) {
+               CERROR("MDS body missing FID\n");
+               return 0;
+       }
 
-        if (!lu_fid_eq(&lli->lli_fid, &md->body->fid1))
-                return 0;
+       if (!lu_fid_eq(&lli->lli_fid, &md->body->mbo_fid1))
+               return 0;
 
-        return 1;
+       return 1;
 }
 
 static int ll_set_inode(struct inode *inode, void *opaque)
 {
-        struct ll_inode_info *lli = ll_i2info(inode);
-        struct mdt_body *body = ((struct lustre_md *)opaque)->body;
+       struct ll_inode_info *lli = ll_i2info(inode);
+       struct mdt_body *body = ((struct lustre_md *)opaque)->body;
 
-        if (unlikely(!(body->valid & OBD_MD_FLID))) {
-                CERROR("MDS body missing FID\n");
-                return -EINVAL;
-        }
+       if (unlikely(!(body->mbo_valid & OBD_MD_FLID))) {
+               CERROR("MDS body missing FID\n");
+               return -EINVAL;
+       }
 
-        lli->lli_fid = body->fid1;
-        if (unlikely(!(body->valid & OBD_MD_FLTYPE))) {
-                CERROR("Can not initialize inode "DFID" without object type: "
-                       "valid = "LPX64"\n", PFID(&lli->lli_fid), body->valid);
-                return -EINVAL;
-        }
+       lli->lli_fid = body->mbo_fid1;
+       if (unlikely(!(body->mbo_valid & OBD_MD_FLTYPE))) {
+               CERROR("Can not initialize inode "DFID" without object type: "
+                      "valid = %#llx\n",
+                      PFID(&lli->lli_fid), body->mbo_valid);
+               return -EINVAL;
+       }
 
-        inode->i_mode = (inode->i_mode & ~S_IFMT) | (body->mode & S_IFMT);
-        if (unlikely(inode->i_mode == 0)) {
-                CERROR("Invalid inode "DFID" type\n", PFID(&lli->lli_fid));
-                return -EINVAL;
-        }
+       inode->i_mode = (inode->i_mode & ~S_IFMT) | (body->mbo_mode & S_IFMT);
+       if (unlikely(inode->i_mode == 0)) {
+               CERROR("Invalid inode "DFID" type\n", PFID(&lli->lli_fid));
+               return -EINVAL;
+       }
 
-        ll_lli_init(lli);
+       ll_lli_init(lli);
 
-        return 0;
+       return 0;
 }
 
 
-/*
- * Get an inode by inode number (already instantiated by the intent lookup).
- * Returns inode or NULL
+/**
+ * Get an inode by inode number(@hash), which is already instantiated by
+ * the intent lookup).
  */
 struct inode *ll_iget(struct super_block *sb, ino_t hash,
                       struct lustre_md *md)
 {
-        struct inode         *inode;
-        ENTRY;
+       struct inode    *inode;
+       int             rc = 0;
+
+       ENTRY;
 
         LASSERT(hash != 0);
         inode = iget5_locked(sb, hash, ll_test_inode, ll_set_inode, md);
+       if (inode == NULL)
+               RETURN(ERR_PTR(-ENOMEM));
+
+       if (inode->i_state & I_NEW) {
+               rc = ll_read_inode2(inode, md);
+               if (rc == 0 && S_ISREG(inode->i_mode) &&
+                   ll_i2info(inode)->lli_clob == NULL)
+                       rc = cl_file_inode_init(inode, md);
+
+               if (rc != 0) {
+                       /* Let's clear directory lsm here, otherwise
+                        * make_bad_inode() will reset the inode mode
+                        * to regular, then ll_clear_inode will not
+                        * be able to clear lsm_md */
+                       if (S_ISDIR(inode->i_mode))
+                               ll_dir_clear_lsm_md(inode);
+                       make_bad_inode(inode);
+                       unlock_new_inode(inode);
+                       iput(inode);
+                       inode = ERR_PTR(rc);
+               } else {
+                       inode_has_no_xattr(inode);
+                       unlock_new_inode(inode);
+               }
+       } else if (is_bad_inode(inode)) {
+               iput(inode);
+               inode = ERR_PTR(-ESTALE);
+       } else if (!(inode->i_state & (I_FREEING | I_CLEAR))) {
+               rc = ll_update_inode(inode, md);
+               CDEBUG(D_VFSTRACE, "got inode: "DFID"(%p): rc = %d\n",
+                      PFID(&md->body->mbo_fid1), inode, rc);
+               if (rc != 0) {
+                       if (S_ISDIR(inode->i_mode))
+                               ll_dir_clear_lsm_md(inode);
+                       iput(inode);
+                       inode = ERR_PTR(rc);
+               }
+       }
 
-        if (inode) {
-                if (inode->i_state & I_NEW) {
-                        int rc = 0;
-
-                        ll_read_inode2(inode, md);
-                        if (S_ISREG(inode->i_mode) &&
-                            ll_i2info(inode)->lli_clob == NULL) {
-                               CDEBUG(D_INODE,
-                                       "%s: apply lsm %p to inode "DFID".\n",
-                                       ll_get_fsname(sb, NULL, 0), md->lsm,
-                                       PFID(ll_inode2fid(inode)));
-                                rc = cl_file_inode_init(inode, md);
-                       }
-                        if (rc != 0) {
-                                make_bad_inode(inode);
-                                unlock_new_inode(inode);
-                                iput(inode);
-                                inode = ERR_PTR(rc);
-                        } else
-                                unlock_new_inode(inode);
-                } else if (!(inode->i_state & (I_FREEING | I_CLEAR)))
-                        ll_update_inode(inode, md);
-                       CDEBUG(D_VFSTRACE, "got inode: "DFID"(%p)\n",
-                              PFID(&md->body->fid1), inode);
-        }
         RETURN(inode);
 }
 
@@ -178,14 +162,14 @@ static void ll_invalidate_negative_children(struct inode *dir)
        DECLARE_LL_D_HLIST_NODE_PTR(p);
 
        ll_lock_dcache(dir);
-       ll_d_hlist_for_each_entry(dentry, p, &dir->i_dentry, d_alias) {
+       ll_d_hlist_for_each_entry(dentry, p, &dir->i_dentry) {
                spin_lock(&dentry->d_lock);
                if (!list_empty(&dentry->d_subdirs)) {
                        struct dentry *child;
 
                        list_for_each_entry_safe(child, tmp_subdir,
                                                 &dentry->d_subdirs,
-                                                d_u.d_child) {
+                                                d_child) {
                                if (child->d_inode == NULL)
                                        d_lustre_invalidate(child, 1);
                        }
@@ -195,116 +179,320 @@ static void ll_invalidate_negative_children(struct inode *dir)
        ll_unlock_dcache(dir);
 }
 
-int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
-                      void *data, int flag)
+int ll_test_inode_by_fid(struct inode *inode, void *opaque)
 {
-       struct lustre_handle lockh;
+       return lu_fid_eq(&ll_i2info(inode)->lli_fid, opaque);
+}
+
+int ll_dom_lock_cancel(struct inode *inode, struct ldlm_lock *lock)
+{
+       struct lu_env *env;
+       struct ll_inode_info *lli = ll_i2info(inode);
+       struct cl_layout clt = { .cl_layout_gen = 0, };
        int rc;
+       __u16 refcheck;
+
+
        ENTRY;
 
-       switch (flag) {
-       case LDLM_CB_BLOCKING:
-               ldlm_lock2handle(lock, &lockh);
-               rc = ldlm_cli_cancel(&lockh, LCF_ASYNC);
-               if (rc < 0) {
-                       CDEBUG(D_INODE, "ldlm_cli_cancel: rc = %d\n", rc);
-                       RETURN(rc);
-               }
-               break;
-       case LDLM_CB_CANCELING: {
-               struct inode *inode = ll_inode_from_resource_lock(lock);
-               __u64 bits = lock->l_policy_data.l_inodebits.bits;
+       if (!lli->lli_clob) {
+               /* due to DoM read on open, there may exist pages for Lustre
+                * regular file even though cl_object is not set up yet. */
+               truncate_inode_pages(inode->i_mapping, 0);
+               RETURN(0);
+       }
 
-               /* Inode is set to lock->l_resource->lr_lvb_inode
-                * for mdc - bug 24555 */
-               LASSERT(lock->l_ast_data == NULL);
+       env = cl_env_get(&refcheck);
+       if (IS_ERR(env))
+               RETURN(PTR_ERR(env));
+
+       rc = cl_object_layout_get(env, lli->lli_clob, &clt);
+       if (rc) {
+               CDEBUG(D_INODE, "Cannot get layout for "DFID"\n",
+                      PFID(ll_inode2fid(inode)));
+               rc = -ENODATA;
+       } else if (clt.cl_size == 0 || clt.cl_dom_comp_size == 0) {
+               CDEBUG(D_INODE, "DOM lock without DOM layout for "DFID"\n",
+                      PFID(ll_inode2fid(inode)));
+       } else {
+               enum cl_fsync_mode mode;
+               loff_t end = clt.cl_dom_comp_size - 1;
 
-               if (inode == NULL)
-                       break;
+               mode = ldlm_is_discard_data(lock) ?
+                                       CL_FSYNC_DISCARD : CL_FSYNC_LOCAL;
+               rc = cl_sync_file_range(inode, 0, end, mode, 1);
+               truncate_inode_pages_range(inode->i_mapping, 0, end);
+       }
+       cl_env_put(env, &refcheck);
+       RETURN(rc);
+}
 
-               /* Invalidate all dentries associated with this inode */
-               LASSERT(ldlm_is_canceling(lock));
+void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel)
+{
+       struct inode *inode = ll_inode_from_resource_lock(lock);
+       struct ll_inode_info *lli;
+       __u64 bits = to_cancel;
+       int rc;
 
-               if (!fid_res_name_eq(ll_inode2fid(inode),
-                                    &lock->l_resource->lr_name)) {
-                       LDLM_ERROR(lock, "data mismatch with object "DFID"(%p)",
-                                  PFID(ll_inode2fid(inode)), inode);
-                       LBUG();
-               }
+       ENTRY;
 
-               if (bits & MDS_INODELOCK_XATTR) {
-                       ll_xattr_cache_destroy(inode);
-                       bits &= ~MDS_INODELOCK_XATTR;
-               }
+       if (!inode) {
+               /* That means the inode is evicted most likely and may cause
+                * the skipping of lock cleanups below, so print the message
+                * about that in log.
+                */
+               if (lock->l_resource->lr_lvb_inode)
+                       LDLM_DEBUG(lock,
+                                  "can't take inode for the lock (%sevicted)\n",
+                                  lock->l_resource->lr_lvb_inode->i_state &
+                                  I_FREEING ? "" : "not ");
+               RETURN_EXIT;
+       }
 
-               /* For OPEN locks we differentiate between lock modes
-                * LCK_CR, LCK_CW, LCK_PR - bug 22891 */
-               if (bits & MDS_INODELOCK_OPEN)
-                       ll_have_md_lock(inode, &bits, lock->l_req_mode);
-
-               if (bits & MDS_INODELOCK_OPEN) {
-                       fmode_t fmode;
-
-                       switch (lock->l_req_mode) {
-                       case LCK_CW:
-                               fmode = FMODE_WRITE;
-                               break;
-                       case LCK_PR:
-                               fmode = FMODE_EXEC;
-                               break;
-                       case LCK_CR:
-                               fmode = FMODE_READ;
-                               break;
-                       default:
-                               LDLM_ERROR(lock, "bad lock mode for OPEN lock");
-                               LBUG();
-                       }
+       if (!fid_res_name_eq(ll_inode2fid(inode),
+                            &lock->l_resource->lr_name)) {
+               LDLM_ERROR(lock, "data mismatch with object "DFID"(%p)",
+                          PFID(ll_inode2fid(inode)), inode);
+               LBUG();
+       }
 
-                       ll_md_real_close(inode, fmode);
+       if (bits & MDS_INODELOCK_XATTR) {
+               ll_xattr_cache_destroy(inode);
+               bits &= ~MDS_INODELOCK_XATTR;
+       }
 
-                       bits &= ~MDS_INODELOCK_OPEN;
-               }
+       /* For OPEN locks we differentiate between lock modes
+        * LCK_CR, LCK_CW, LCK_PR - bug 22891 */
+       if (bits & MDS_INODELOCK_OPEN)
+               ll_have_md_lock(inode, &bits, lock->l_req_mode);
+
+       if (bits & MDS_INODELOCK_OPEN) {
+               fmode_t fmode;
 
-               if (bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_UPDATE |
-                           MDS_INODELOCK_LAYOUT | MDS_INODELOCK_PERM))
-                       ll_have_md_lock(inode, &bits, LCK_MINMODE);
-
-               if (bits & MDS_INODELOCK_LAYOUT) {
-                       struct cl_object_conf conf = {
-                               .coc_opc = OBJECT_CONF_INVALIDATE,
-                               .coc_inode = inode,
-                       };
-
-                       rc = ll_layout_conf(inode, &conf);
-                       if (rc < 0)
-                               CDEBUG(D_INODE, "cannot invalidate layout of "
-                                      DFID": rc = %d\n",
-                                      PFID(ll_inode2fid(inode)), rc);
+               switch (lock->l_req_mode) {
+               case LCK_CW:
+                       fmode = FMODE_WRITE;
+                       break;
+               case LCK_PR:
+                       fmode = FMODE_EXEC;
+                       break;
+               case LCK_CR:
+                       fmode = FMODE_READ;
+                       break;
+               default:
+                       LDLM_ERROR(lock, "bad lock mode for OPEN lock");
+                       LBUG();
                }
 
-               if (bits & MDS_INODELOCK_UPDATE) {
-                       struct ll_inode_info *lli = ll_i2info(inode);
+               ll_md_real_close(inode, fmode);
 
-                       spin_lock(&lli->lli_lock);
-                       lli->lli_flags &= ~LLIF_MDS_SIZE_LOCK;
-                       spin_unlock(&lli->lli_lock);
-               }
+               bits &= ~MDS_INODELOCK_OPEN;
+       }
 
-               if ((bits & MDS_INODELOCK_UPDATE) && S_ISDIR(inode->i_mode)) {
-                       CDEBUG(D_INODE, "invalidating inode "DFID"\n",
-                              PFID(ll_inode2fid(inode)));
-                       truncate_inode_pages(inode->i_mapping, 0);
+       if (bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_UPDATE |
+                   MDS_INODELOCK_LAYOUT | MDS_INODELOCK_PERM |
+                   MDS_INODELOCK_DOM))
+               ll_have_md_lock(inode, &bits, LCK_MINMODE);
+
+       if (bits & MDS_INODELOCK_DOM) {
+               rc =  ll_dom_lock_cancel(inode, lock);
+               if (rc < 0)
+                       CDEBUG(D_INODE, "cannot flush DoM data "
+                              DFID": rc = %d\n",
+                              PFID(ll_inode2fid(inode)), rc);
+               lock_res_and_lock(lock);
+               ldlm_set_kms_ignore(lock);
+               unlock_res_and_lock(lock);
+       }
+
+       if (bits & MDS_INODELOCK_LAYOUT) {
+               struct cl_object_conf conf = {
+                       .coc_opc = OBJECT_CONF_INVALIDATE,
+                       .coc_inode = inode,
+               };
+
+               rc = ll_layout_conf(inode, &conf);
+               if (rc < 0)
+                       CDEBUG(D_INODE, "cannot invalidate layout of "
+                              DFID": rc = %d\n",
+                              PFID(ll_inode2fid(inode)), rc);
+       }
+
+       lli = ll_i2info(inode);
+
+       if (bits & MDS_INODELOCK_UPDATE)
+               lli->lli_update_atime = 1;
+
+       if ((bits & MDS_INODELOCK_UPDATE) && S_ISDIR(inode->i_mode)) {
+               CDEBUG(D_INODE, "invalidating inode "DFID" lli = %p, "
+                      "pfid  = "DFID"\n", PFID(ll_inode2fid(inode)),
+                      lli, PFID(&lli->lli_pfid));
+               truncate_inode_pages(inode->i_mapping, 0);
+
+               if (unlikely(!fid_is_zero(&lli->lli_pfid))) {
+                       struct inode *master_inode = NULL;
+                       unsigned long hash;
+
+                       /* This is slave inode, since all of the child dentry
+                        * is connected on the master inode, so we have to
+                        * invalidate the negative children on master inode */
+                       CDEBUG(D_INODE, "Invalidate s"DFID" m"DFID"\n",
+                              PFID(ll_inode2fid(inode)), PFID(&lli->lli_pfid));
+
+                       hash = cl_fid_build_ino(&lli->lli_pfid,
+                                       ll_need_32bit_api(ll_i2sbi(inode)));
+
+                       /* Do not lookup the inode with ilookup5, otherwise
+                        * it will cause dead lock,
+                        * 1. Client1 send chmod req to the MDT0, then on MDT0,
+                        * it enqueues master and all of its slaves lock,
+                        * (mdt_attr_set() -> mdt_lock_slaves()), after gets
+                        * master and stripe0 lock, it will send the enqueue
+                        * req (for stripe1) to MDT1, then MDT1 finds the lock
+                        * has been granted to client2. Then MDT1 sends blocking
+                        * ast to client2.
+                        * 2. At the same time, client2 tries to unlink
+                        * the striped dir (rm -rf striped_dir), and during
+                        * lookup, it will hold the master inode of the striped
+                        * directory, whose inode state is NEW, then tries to
+                        * revalidate all of its slaves, (ll_prep_inode()->
+                        * ll_iget()->ll_read_inode2()-> ll_update_inode().).
+                        * And it will be blocked on the server side because
+                        * of 1.
+                        * 3. Then the client get the blocking_ast req, cancel
+                        * the lock, but being blocked if using ->ilookup5()),
+                        * because master inode state is NEW. */
+                       master_inode = ilookup5_nowait(inode->i_sb, hash,
+                                                       ll_test_inode_by_fid,
+                                                       (void *)&lli->lli_pfid);
+                       if (master_inode) {
+                               ll_invalidate_negative_children(master_inode);
+                               iput(master_inode);
+                       }
+               } else {
                        ll_invalidate_negative_children(inode);
                }
+       }
 
-               if ((bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_PERM)) &&
-                   inode->i_sb->s_root != NULL &&
-                   inode != inode->i_sb->s_root->d_inode)
-                       ll_invalidate_aliases(inode);
+       if ((bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_PERM)) &&
+           inode->i_sb->s_root != NULL &&
+           inode != inode->i_sb->s_root->d_inode)
+               ll_invalidate_aliases(inode);
 
-               iput(inode);
+       iput(inode);
+       RETURN_EXIT;
+}
+
+/* Check if the given lock may be downgraded instead of canceling and
+ * that convert is really needed. */
+int ll_md_need_convert(struct ldlm_lock *lock)
+{
+       struct ldlm_namespace *ns = ldlm_lock_to_ns(lock);
+       struct inode *inode;
+       __u64 wanted = lock->l_policy_data.l_inodebits.cancel_bits;
+       __u64 bits = lock->l_policy_data.l_inodebits.bits & ~wanted;
+       enum ldlm_mode mode = LCK_MINMODE;
+
+       if (!lock->l_conn_export ||
+           !exp_connect_lock_convert(lock->l_conn_export))
+               return 0;
+
+       if (!wanted || !bits || ldlm_is_cancel(lock))
+               return 0;
+
+       /* do not convert locks other than DOM for now */
+       if (!((bits | wanted) & MDS_INODELOCK_DOM))
+               return 0;
+
+       /* We may have already remaining bits in some other lock so
+        * lock convert will leave us just extra lock for the same bit.
+        * Check if client has other lock with the same bits and the same
+        * or lower mode and don't convert if any.
+        */
+       switch (lock->l_req_mode) {
+       case LCK_PR:
+               mode = LCK_PR;
+       case LCK_PW:
+               mode |= LCK_CR;
+               break;
+       case LCK_CW:
+               mode = LCK_CW;
+       case LCK_CR:
+               mode |= LCK_CR;
+               break;
+       default:
+               /* do not convert other modes */
+               return 0;
+       }
+
+       /* is lock is too old to be converted? */
+       lock_res_and_lock(lock);
+       if (ktime_after(ktime_get(),
+                       ktime_add(lock->l_last_used,
+                                 ktime_set(ns->ns_dirty_age_limit, 0)))) {
+               unlock_res_and_lock(lock);
+               return 0;
+       }
+       unlock_res_and_lock(lock);
+
+       inode = ll_inode_from_resource_lock(lock);
+       ll_have_md_lock(inode, &bits, mode);
+       iput(inode);
+       return !!(bits);
+}
+
+int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
+                      void *data, int flag)
+{
+       struct lustre_handle lockh;
+       __u64 bits = lock->l_policy_data.l_inodebits.bits;
+       int rc;
+
+       ENTRY;
+
+       switch (flag) {
+       case LDLM_CB_BLOCKING:
+       {
+               __u64 cancel_flags = LCF_ASYNC;
+
+               if (ll_md_need_convert(lock)) {
+                       cancel_flags |= LCF_CONVERT;
+                       /* For lock convert some cancel actions may require
+                        * this lock with non-dropped canceled bits, e.g. page
+                        * flush for DOM lock. So call ll_lock_cancel_bits()
+                        * here while canceled bits are still set.
+                        */
+                       bits = lock->l_policy_data.l_inodebits.cancel_bits;
+                       if (bits & MDS_INODELOCK_DOM)
+                               ll_lock_cancel_bits(lock, MDS_INODELOCK_DOM);
+               }
+               ldlm_lock2handle(lock, &lockh);
+               rc = ldlm_cli_cancel(&lockh, cancel_flags);
+               if (rc < 0) {
+                       CDEBUG(D_INODE, "ldlm_cli_cancel: rc = %d\n", rc);
+                       RETURN(rc);
+               }
                break;
        }
+       case LDLM_CB_CANCELING:
+               /* Nothing to do for non-granted locks */
+               if (!ldlm_is_granted(lock))
+                       break;
+
+               if (ldlm_is_converting(lock)) {
+                       /* this is called on already converted lock, so
+                        * ibits has remained bits only and cancel_bits
+                        * are bits that were dropped.
+                        * Note that DOM lock is handled prior lock convert
+                        * and is excluded here.
+                        */
+                       bits = lock->l_policy_data.l_inodebits.cancel_bits &
+                               ~MDS_INODELOCK_DOM;
+               } else {
+                       LASSERT(ldlm_is_canceling(lock));
+               }
+               ll_lock_cancel_bits(lock, bits);
+               break;
        default:
                LBUG();
        }
@@ -315,9 +503,9 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 __u32 ll_i2suppgid(struct inode *i)
 {
        if (in_group_p(i->i_gid))
-               return (__u32)i->i_gid;
+               return (__u32)from_kgid(&init_user_ns, i->i_gid);
        else
-               return (__u32)(-1);
+               return (__u32) __kgid_val(INVALID_GID);
 }
 
 /* Pack the required supplementary groups into the supplied groups array.
@@ -326,35 +514,15 @@ __u32 ll_i2suppgid(struct inode *i)
  * array in case it might be useful.  Not needed if doing an MDS-side upcall. */
 void ll_i2gids(__u32 *suppgids, struct inode *i1, struct inode *i2)
 {
-#if 0
-        int i;
-#endif
+       LASSERT(i1 != NULL);
+       LASSERT(suppgids != NULL);
 
-        LASSERT(i1 != NULL);
-        LASSERT(suppgids != NULL);
-
-        suppgids[0] = ll_i2suppgid(i1);
-
-        if (i2)
-                suppgids[1] = ll_i2suppgid(i2);
-                else
-                        suppgids[1] = -1;
-
-#if 0
-        for (i = 0; i < current_ngroups; i++) {
-                if (suppgids[0] == -1) {
-                        if (current_groups[i] != suppgids[1])
-                                suppgids[0] = current_groups[i];
-                        continue;
-                }
-                if (suppgids[1] == -1) {
-                        if (current_groups[i] != suppgids[0])
-                                suppgids[1] = current_groups[i];
-                        continue;
-                }
-                break;
-        }
-#endif
+       suppgids[0] = ll_i2suppgid(i1);
+
+       if (i2)
+               suppgids[1] = ll_i2suppgid(i2);
+       else
+               suppgids[1] = -1;
 }
 
 /*
@@ -376,11 +544,12 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry)
        discon_alias = invalid_alias = NULL;
 
        ll_lock_dcache(inode);
-       ll_d_hlist_for_each_entry(alias, p, &inode->i_dentry, d_alias) {
+       ll_d_hlist_for_each_entry(alias, p, &inode->i_dentry) {
                LASSERT(alias != dentry);
 
                spin_lock(&alias->d_lock);
-               if (alias->d_flags & DCACHE_DISCONNECTED)
+               if ((alias->d_flags & DCACHE_DISCONNECTED) &&
+                   S_ISDIR(inode->i_mode))
                        /* LASSERT(last_discon == NULL); LU-405, bz 20055 */
                        discon_alias = alias;
                else if (alias->d_parent == dentry->d_parent             &&
@@ -426,7 +595,7 @@ struct dentry *ll_splice_alias(struct inode *inode, struct dentry *de)
                        iput(inode);
                        CDEBUG(D_DENTRY,
                               "Reuse dentry %p inode %p refc %d flags %#x\n",
-                             new, new->d_inode, d_count(new), new->d_flags);
+                             new, new->d_inode, ll_d_count(new), new->d_flags);
                        return new;
                }
        }
@@ -435,95 +604,147 @@ struct dentry *ll_splice_alias(struct inode *inode, struct dentry *de)
                return ERR_PTR(rc);
        d_add(de, inode);
        CDEBUG(D_DENTRY, "Add dentry %p inode %p refc %d flags %#x\n",
-              de, de->d_inode, d_count(de), de->d_flags);
+              de, de->d_inode, ll_d_count(de), de->d_flags);
         return de;
 }
 
-int ll_lookup_it_finish(struct ptlrpc_request *request,
-                        struct lookup_intent *it, void *data)
+static int ll_lookup_it_finish(struct ptlrpc_request *request,
+                              struct lookup_intent *it,
+                              struct inode *parent, struct dentry **de,
+                              void *secctx, __u32 secctxlen)
 {
-       struct it_cb_data        *icbd = data;
-       struct dentry           **de = icbd->icbd_childp;
-       struct inode             *parent = icbd->icbd_parent;
        struct inode             *inode = NULL;
        __u64                     bits = 0;
        int                       rc;
+       struct dentry *alias;
        ENTRY;
 
        /* NB 1 request reference will be taken away by ll_intent_lock()
         * when I return */
        CDEBUG(D_DENTRY, "it %p it_disposition %x\n", it,
-              it->d.lustre.it_disposition);
+              it->it_disposition);
        if (!it_disposition(it, DISP_LOOKUP_NEG)) {
-                rc = ll_prep_inode(&inode, request, (*de)->d_sb, it);
-                if (rc)
-                        RETURN(rc);
-
-                ll_set_lock_data(ll_i2sbi(parent)->ll_md_exp, inode, it, &bits);
-
-                /* We used to query real size from OSTs here, but actually
-                   this is not needed. For stat() calls size would be updated
-                   from subsequent do_revalidate()->ll_inode_revalidate_it() in
-                   2.4 and
-                   vfs_getattr_it->ll_getattr()->ll_inode_revalidate_it() in 2.6
-                   Everybody else who needs correct file size would call
-                   ll_glimpse_size or some equivalent themselves anyway.
-                   Also see bug 7198. */
+               struct req_capsule *pill = &request->rq_pill;
+               struct mdt_body *body = req_capsule_server_get(pill,
+                                                              &RMF_MDT_BODY);
+
+               rc = ll_prep_inode(&inode, request, (*de)->d_sb, it);
+               if (rc)
+                       RETURN(rc);
+
+               if (it->it_op & IT_OPEN)
+                       ll_dom_finish_open(inode, request, it);
+
+               ll_set_lock_data(ll_i2sbi(parent)->ll_md_exp, inode, it, &bits);
+
+               /* We used to query real size from OSTs here, but actually
+                * this is not needed. For stat() calls size would be updated
+                * from subsequent do_revalidate()->ll_inode_revalidate_it() in
+                * 2.4 and
+                * vfs_getattr_it->ll_getattr()->ll_inode_revalidate_it() in 2.6
+                * Everybody else who needs correct file size would call
+                * ll_glimpse_size or some equivalent themselves anyway.
+                * Also see bug 7198.
+                */
+
+               /* If security context was returned by MDT, put it in
+                * inode now to save an extra getxattr from security hooks,
+                * and avoid deadlock.
+                */
+               if (body->mbo_valid & OBD_MD_SECCTX) {
+                       secctx = req_capsule_server_get(pill, &RMF_FILE_SECCTX);
+                       secctxlen = req_capsule_get_size(pill,
+                                                          &RMF_FILE_SECCTX,
+                                                          RCL_SERVER);
+
+                       if (secctxlen)
+                               CDEBUG(D_SEC, "server returned security context"
+                                      " for "DFID"\n",
+                                      PFID(ll_inode2fid(inode)));
+               }
+
+               if (secctx != NULL && secctxlen != 0) {
+                       inode_lock(inode);
+                       rc = security_inode_notifysecctx(inode, secctx,
+                                                        secctxlen);
+                       inode_unlock(inode);
+                       if (rc)
+                               CWARN("cannot set security context for "
+                                     DFID": rc = %d\n",
+                                     PFID(ll_inode2fid(inode)), rc);
+               }
        }
 
        /* Only hash *de if it is unhashed (new dentry).
         * Atoimc_open may passin hashed dentries for open.
         */
-       if (d_unhashed(*de)) {
-               struct dentry *alias;
-
-               alias = ll_splice_alias(inode, *de);
-               if (IS_ERR(alias))
-                       RETURN(PTR_ERR(alias));
-               *de = alias;
-       } else if (!it_disposition(it, DISP_LOOKUP_NEG)  &&
-                  !it_disposition(it, DISP_OPEN_CREATE)) {
-               /* With DISP_OPEN_CREATE dentry will
-                  instantiated in ll_create_it. */
-               LASSERT((*de)->d_inode == NULL);
-               d_instantiate(*de, inode);
-       }
+       alias = ll_splice_alias(inode, *de);
+       if (IS_ERR(alias))
+               GOTO(out, rc = PTR_ERR(alias));
+
+       *de = alias;
 
        if (!it_disposition(it, DISP_LOOKUP_NEG)) {
                /* we have lookup look - unhide dentry */
                if (bits & MDS_INODELOCK_LOOKUP)
                        d_lustre_revalidate(*de);
        } else if (!it_disposition(it, DISP_OPEN_CREATE)) {
-               /* If file created on server, don't depend on parent UPDATE
-                * lock to unhide it. It is left hidden and next lookup can
-                * find it in ll_splice_alias.
+               /*
+                * If file was created on the server, the dentry is revalidated
+                * in ll_create_it if the lock allows for it.
                 */
                /* Check that parent has UPDATE lock. */
                struct lookup_intent parent_it = {
                                        .it_op = IT_GETATTR,
-                                       .d.lustre.it_lock_handle = 0 };
+                                       .it_lock_handle = 0 };
+               struct lu_fid   fid = ll_i2info(parent)->lli_fid;
+
+               /* If it is striped directory, get the real stripe parent */
+               if (unlikely(ll_dir_striped(parent))) {
+                       rc = md_get_fid_from_lsm(ll_i2mdexp(parent),
+                                                ll_i2info(parent)->lli_lsm_md,
+                                                (*de)->d_name.name,
+                                                (*de)->d_name.len, &fid);
+                       if (rc != 0)
+                               GOTO(out, rc);
+               }
 
-               if (md_revalidate_lock(ll_i2mdexp(parent), &parent_it,
-                                      &ll_i2info(parent)->lli_fid, NULL)) {
+               if (md_revalidate_lock(ll_i2mdexp(parent), &parent_it, &fid,
+                                      NULL)) {
                        d_lustre_revalidate(*de);
                        ll_intent_release(&parent_it);
                }
-        }
+       }
+
+       GOTO(out, rc = 0);
+
+out:
+       if (rc != 0 && it->it_op & IT_OPEN)
+               ll_open_cleanup((*de)->d_sb, request);
 
-        RETURN(0);
+       return rc;
 }
 
+struct pcc_create_attach {
+       struct pcc_dataset *pca_dataset;
+       struct dentry *pca_dentry;
+};
+
 static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
-                                   struct lookup_intent *it, int lookup_flags)
+                                  struct lookup_intent *it,
+                                  void **secctx, __u32 *secctxlen,
+                                  struct pcc_create_attach *pca)
 {
-        struct lookup_intent lookup_it = { .it_op = IT_LOOKUP };
-        struct dentry *save = dentry, *retval;
-        struct ptlrpc_request *req = NULL;
-        struct md_op_data *op_data;
-        struct it_cb_data icbd;
-        __u32 opc;
-        int rc;
-        ENTRY;
+       struct lookup_intent lookup_it = { .it_op = IT_LOOKUP };
+       struct dentry *save = dentry, *retval;
+       struct ptlrpc_request *req = NULL;
+       struct md_op_data *op_data = NULL;
+       struct lov_user_md *lum = NULL;
+       __u32 opc;
+       int rc;
+       char secctx_name[XATTR_NAME_MAX + 1];
+
+       ENTRY;
 
         if (dentry->d_name.len > ll_i2sbi(parent)->ll_namelen)
                 RETURN(ERR_PTR(-ENAMETOOLONG));
@@ -535,42 +756,132 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
         if (d_mountpoint(dentry))
                 CERROR("Tell Peter, lookup on mtpt, it %s\n", LL_IT2STR(it));
 
-        ll_frob_intent(&it, &lookup_it);
+       if (it == NULL || it->it_op == IT_GETXATTR)
+               it = &lookup_it;
 
-        if (it->it_op == IT_GETATTR) {
-                rc = ll_statahead_enter(parent, &dentry, 0);
-                if (rc == 1) {
-                        if (dentry == save)
-                                GOTO(out, retval = NULL);
-                        GOTO(out, retval = dentry);
-                }
-        }
+       if (it->it_op == IT_GETATTR && dentry_may_statahead(parent, dentry)) {
+               rc = ll_statahead(parent, &dentry, 0);
+               if (rc == 1)
+                       RETURN(dentry == save ? NULL : dentry);
+       }
 
-        icbd.icbd_childp = &dentry;
-        icbd.icbd_parent = parent;
+       if (it->it_op & IT_OPEN && it->it_flags & FMODE_WRITE &&
+           dentry->d_sb->s_flags & SB_RDONLY)
+               RETURN(ERR_PTR(-EROFS));
 
        if (it->it_op & IT_CREAT)
                opc = LUSTRE_OPC_CREATE;
        else
                opc = LUSTRE_OPC_ANY;
 
-        op_data = ll_prep_md_op_data(NULL, parent, NULL, dentry->d_name.name,
-                                     dentry->d_name.len, lookup_flags, opc,
-                                     NULL);
-        if (IS_ERR(op_data))
-                RETURN((void *)op_data);
+       op_data = ll_prep_md_op_data(NULL, parent, NULL, dentry->d_name.name,
+                                    dentry->d_name.len, 0, opc, NULL);
+       if (IS_ERR(op_data))
+               GOTO(out, retval = ERR_CAST(op_data));
 
-        /* enforce umask if acl disabled or MDS doesn't support umask */
-        if (!IS_POSIXACL(parent) || !exp_connect_umask(ll_i2mdexp(parent)))
+       /* enforce umask if acl disabled or MDS doesn't support umask */
+       if (!IS_POSIXACL(parent) || !exp_connect_umask(ll_i2mdexp(parent)))
                it->it_create_mode &= ~current_umask();
 
-        rc = md_intent_lock(ll_i2mdexp(parent), op_data, NULL, 0, it,
-                            lookup_flags, &req, ll_md_blocking_ast, 0);
-        ll_finish_md_op_data(op_data);
-        if (rc < 0)
-                GOTO(out, retval = ERR_PTR(rc));
+       if (it->it_op & IT_CREAT &&
+           ll_i2sbi(parent)->ll_flags & LL_SBI_FILE_SECCTX) {
+               rc = ll_dentry_init_security(dentry, it->it_create_mode,
+                                            &dentry->d_name,
+                                            &op_data->op_file_secctx_name,
+                                            &op_data->op_file_secctx,
+                                            &op_data->op_file_secctx_size);
+               if (rc < 0)
+                       GOTO(out, retval = ERR_PTR(rc));
+               if (secctx != NULL)
+                       *secctx = op_data->op_file_secctx;
+               if (secctxlen != NULL)
+                       *secctxlen = op_data->op_file_secctx_size;
+       } else {
+               if (secctx != NULL)
+                       *secctx = NULL;
+               if (secctxlen != NULL)
+                       *secctxlen = 0;
+       }
+
+       /* ask for security context upon intent */
+       if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_OPEN)) {
+               /* get name of security xattr to request to server */
+               rc = ll_listsecurity(parent, secctx_name,
+                                    sizeof(secctx_name));
+               if (rc < 0) {
+                       CDEBUG(D_SEC, "cannot get security xattr name for "
+                              DFID": rc = %d\n",
+                              PFID(ll_inode2fid(parent)), rc);
+               } else if (rc > 0) {
+                       op_data->op_file_secctx_name = secctx_name;
+                       op_data->op_file_secctx_name_size = rc;
+                       CDEBUG(D_SEC, "'%.*s' is security xattr for "DFID"\n",
+                              rc, secctx_name, PFID(ll_inode2fid(parent)));
+               }
+       }
+
+       if (pca && pca->pca_dataset) {
+               struct pcc_dataset *dataset = pca->pca_dataset;
+
+               OBD_ALLOC_PTR(lum);
+               if (lum == NULL)
+                       GOTO(out, retval = ERR_PTR(-ENOMEM));
 
-        rc = ll_lookup_it_finish(req, it, &icbd);
+               lum->lmm_magic = LOV_USER_MAGIC_V1;
+               lum->lmm_pattern = LOV_PATTERN_F_RELEASED | LOV_PATTERN_RAID0;
+               op_data->op_data = lum;
+               op_data->op_data_size = sizeof(*lum);
+               op_data->op_archive_id = dataset->pccd_rwid;
+
+               rc = obd_fid_alloc(NULL, ll_i2mdexp(parent), &op_data->op_fid2,
+                                  op_data);
+               if (rc)
+                       GOTO(out, retval = ERR_PTR(rc));
+
+               rc = pcc_inode_create(parent->i_sb, dataset, &op_data->op_fid2,
+                                     &pca->pca_dentry);
+               if (rc)
+                       GOTO(out, retval = ERR_PTR(rc));
+
+               it->it_flags |= MDS_OPEN_PCC;
+       }
+
+       rc = md_intent_lock(ll_i2mdexp(parent), op_data, it, &req,
+                           &ll_md_blocking_ast, 0);
+       /* If the MDS allows the client to chgrp (CFS_SETGRP_PERM), but the
+        * client does not know which suppgid should be sent to the MDS, or
+        * some other(s) changed the target file's GID after this RPC sent
+        * to the MDS with the suppgid as the original GID, then we should
+        * try again with right suppgid. */
+       if (rc == -EACCES && it->it_op & IT_OPEN &&
+           it_disposition(it, DISP_OPEN_DENY)) {
+               struct mdt_body *body;
+
+               LASSERT(req != NULL);
+
+               body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+               if (op_data->op_suppgids[0] == body->mbo_gid ||
+                   op_data->op_suppgids[1] == body->mbo_gid ||
+                   !in_group_p(make_kgid(&init_user_ns, body->mbo_gid)))
+                       GOTO(out, retval = ERR_PTR(-EACCES));
+
+               fid_zero(&op_data->op_fid2);
+               op_data->op_suppgids[1] = body->mbo_gid;
+               ptlrpc_req_finished(req);
+               req = NULL;
+               ll_intent_release(it);
+               rc = md_intent_lock(ll_i2mdexp(parent), op_data, it, &req,
+                                   &ll_md_blocking_ast, 0);
+       }
+
+       if (rc < 0)
+               GOTO(out, retval = ERR_PTR(rc));
+
+       /* dir layout may change */
+       ll_unlock_md_op_lsm(op_data);
+       rc = ll_lookup_it_finish(req, it, parent, &dentry,
+                                secctx != NULL ? *secctx : NULL,
+                                secctxlen != NULL ? *secctxlen : 0);
         if (rc != 0) {
                 ll_intent_release(it);
                 GOTO(out, retval = ERR_PTR(rc));
@@ -583,16 +894,24 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
         }
         ll_lookup_finish_locks(it, dentry);
 
-        if (dentry == save)
-                GOTO(out, retval = NULL);
-        else
-                GOTO(out, retval = dentry);
- out:
-        if (req)
-                ptlrpc_req_finished(req);
-        if (it->it_op == IT_GETATTR && (retval == NULL || retval == dentry))
-                ll_statahead_mark(parent, dentry);
-        return retval;
+       GOTO(out, retval = (dentry == save) ? NULL : dentry);
+
+out:
+       if (op_data != NULL && !IS_ERR(op_data)) {
+               if (secctx != NULL && secctxlen != NULL) {
+                       /* caller needs sec ctx info, so reset it in op_data to
+                        * prevent it from being freed */
+                       op_data->op_file_secctx = NULL;
+                       op_data->op_file_secctx_size = 0;
+               }
+               ll_finish_md_op_data(op_data);
+       }
+
+       if (lum != NULL)
+               OBD_FREE_PTR(lum);
+
+       ptlrpc_req_finished(req);
+       return retval;
 }
 
 #ifdef HAVE_IOP_ATOMIC_OPEN
@@ -606,15 +925,20 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry,
               dentry->d_name.len, dentry->d_name.name,
               PFID(ll_inode2fid(parent)), parent, flags);
 
-       /* Optimize away (CREATE && !OPEN). Let .create handle the race. */
-       if ((flags & LOOKUP_CREATE) && !(flags & LOOKUP_OPEN))
+       /*
+        * Optimize away (CREATE && !OPEN). Let .create handle the race.
+        * but only if we have write permissions there, otherwise we need
+        * to proceed with lookup. LU-4185
+        */
+       if ((flags & LOOKUP_CREATE) && !(flags & LOOKUP_OPEN) &&
+           (inode_permission(parent, MAY_WRITE | MAY_EXEC) == 0))
                return NULL;
 
        if (flags & (LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE))
                itp = NULL;
        else
                itp = &it;
-       de = ll_lookup_it(parent, dentry, itp, 0);
+       de = ll_lookup_it(parent, dentry, itp, NULL, NULL, NULL);
 
        if (itp != NULL)
                ll_intent_release(itp);
@@ -622,24 +946,68 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry,
        return de;
 }
 
+#ifdef FMODE_CREATED /* added in Linux v4.18-rc1-20-g73a09dd */
+# define ll_is_opened(o, f)            ((f)->f_mode & FMODE_OPENED)
+# define ll_finish_open(f, d, o)       finish_open((f), (d), NULL)
+# define ll_last_arg
+# define ll_set_created(o, f)                                          \
+do {                                                                   \
+       (f)->f_mode |= FMODE_CREATED;                                   \
+} while (0)
+
+#else
+# define ll_is_opened(o, f)            (*(o))
+# define ll_finish_open(f, d, o)       finish_open((f), (d), NULL, (o))
+# define ll_last_arg                   , int *opened
+# define ll_set_created(o, f)                                          \
+do {                                                                   \
+       *(o) |= FILE_CREATED;                                           \
+} while (0)
+
+#endif
+
 /*
  * For cached negative dentry and new dentry, handle lookup/create/open
  * together.
  */
 static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
                          struct file *file, unsigned open_flags,
-                         umode_t mode, int *opened)
+                         umode_t mode ll_last_arg)
 {
        struct lookup_intent *it;
        struct dentry *de;
        long long lookup_flags = LOOKUP_OPEN;
+       void *secctx = NULL;
+       __u32 secctxlen = 0;
+       struct ll_sb_info *sbi;
+       struct pcc_create_attach pca = {NULL, NULL};
+       struct pcc_dataset *dataset = NULL;
        int rc = 0;
        ENTRY;
 
        CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p), file %p,"
                           "open_flags %x, mode %x opened %d\n",
               dentry->d_name.len, dentry->d_name.name,
-              PFID(ll_inode2fid(dir)), dir, file, open_flags, mode, *opened);
+              PFID(ll_inode2fid(dir)), dir, file, open_flags, mode,
+              ll_is_opened(opened, file));
+
+       /* Only negative dentries enter here */
+       LASSERT(dentry->d_inode == NULL);
+
+       if (!d_unhashed(dentry)) {
+               /* A valid negative dentry that just passed revalidation,
+                * there's little point to try and open it server-side,
+                * even though there's a minuscule chance it might succeed.
+                * Either way it's a valid race to just return -ENOENT here.
+                */
+               if (!(open_flags & O_CREAT))
+                       return -ENOENT;
+
+               /* Otherwise we just unhash it to be rehashed afresh via
+                * lookup if necessary
+                */
+               d_drop(dentry);
+       }
 
        OBD_ALLOC(it, sizeof(*it));
        if (!it)
@@ -649,44 +1017,68 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
        if (open_flags & O_CREAT) {
                it->it_op |= IT_CREAT;
                lookup_flags |= LOOKUP_CREATE;
+               sbi = ll_i2sbi(dir);
+               /* Volatile file is used for HSM restore, so do not use PCC */
+               if (!filename_is_volatile(dentry->d_name.name,
+                                         dentry->d_name.len, NULL)) {
+                       struct pcc_matcher item;
+
+                       item.pm_uid = from_kuid(&init_user_ns, current_uid());
+                       item.pm_gid = from_kgid(&init_user_ns, current_gid());
+                       item.pm_projid = ll_i2info(dir)->lli_projid;
+                       item.pm_name = &dentry->d_name;
+                       dataset = pcc_dataset_match_get(&sbi->ll_pcc_super,
+                                                       &item);
+                       pca.pca_dataset = dataset;
+               }
        }
        it->it_create_mode = (mode & S_IALLUGO) | S_IFREG;
        it->it_flags = (open_flags & ~O_ACCMODE) | OPEN_FMODE(open_flags);
+       it->it_flags &= ~MDS_OPEN_FL_INTERNAL;
 
        /* Dentry added to dcache tree in ll_lookup_it */
-       de = ll_lookup_it(dir, dentry, it, lookup_flags);
+       de = ll_lookup_it(dir, dentry, it, &secctx, &secctxlen, &pca);
        if (IS_ERR(de))
                rc = PTR_ERR(de);
        else if (de != NULL)
                dentry = de;
 
+       CFS_FAIL_TIMEOUT(OBD_FAIL_LLITE_CREATE_FILE_PAUSE, cfs_fail_val);
+
        if (!rc) {
                if (it_disposition(it, DISP_OPEN_CREATE)) {
                        /* Dentry instantiated in ll_create_it. */
-                       rc = ll_create_it(dir, dentry, mode, it);
+                       rc = ll_create_it(dir, dentry, it, secctx, secctxlen);
+                       security_release_secctx(secctx, secctxlen);
                        if (rc) {
                                /* We dget in ll_splice_alias. */
                                if (de != NULL)
                                        dput(de);
                                goto out_release;
                        }
-
-                       *opened |= FILE_CREATED;
+                       if (dataset != NULL && dentry->d_inode) {
+                               rc = pcc_inode_create_fini(dataset,
+                                                          dentry->d_inode,
+                                                          pca.pca_dentry);
+                               if (rc) {
+                                       if (de != NULL)
+                                               dput(de);
+                                       GOTO(out_release, rc);
+                               }
+                       }
+                       ll_set_created(opened, file);
                }
+
                if (dentry->d_inode && it_disposition(it, DISP_OPEN_OPEN)) {
                        /* Open dentry. */
                        if (S_ISFIFO(dentry->d_inode->i_mode)) {
-                               /* We cannot call open here as it would
-                                * deadlock.
-                                */
-                               if (it_disposition(it, DISP_ENQ_OPEN_REF))
-                                       ptlrpc_req_finished(
-                                                      (struct ptlrpc_request *)
-                                                         it->d.lustre.it_data);
+                               /* We cannot call open here as it might
+                                * deadlock. This case is unreachable in
+                                * practice because of OBD_CONNECT_NODEVOH. */
                                rc = finish_no_open(file, de);
                        } else {
                                file->private_data = it;
-                               rc = finish_open(file, dentry, NULL, opened);
+                               rc = ll_finish_open(file, dentry, opened);
                                /* We dget in ll_splice_alias. finish_open takes
                                 * care of dget for fd open.
                                 */
@@ -699,6 +1091,8 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
        }
 
 out_release:
+       if (dataset != NULL)
+               pcc_dataset_put(dataset);
        ll_intent_release(it);
        OBD_FREE(it, sizeof(*it));
 
@@ -706,21 +1100,24 @@ out_release:
 }
 
 #else /* !HAVE_IOP_ATOMIC_OPEN */
-struct lookup_intent *ll_convert_intent(struct open_intent *oit,
-                                        int lookup_flags)
+static struct lookup_intent *
+ll_convert_intent(struct open_intent *oit, int lookup_flags, bool is_readonly)
 {
        struct lookup_intent *it;
 
-       OBD_ALLOC(it, sizeof(*it));
+       OBD_ALLOC_PTR(it);
        if (!it)
                return ERR_PTR(-ENOMEM);
 
        if (lookup_flags & LOOKUP_OPEN) {
                it->it_op = IT_OPEN;
-               if (lookup_flags & LOOKUP_CREATE)
+               /* Avoid file creation for ro bind mount point(is_readonly) */
+               if ((lookup_flags & LOOKUP_CREATE) && !is_readonly)
                        it->it_op |= IT_CREAT;
                it->it_create_mode = (oit->create_mode & S_IALLUGO) | S_IFREG;
-               it->it_flags = ll_namei_to_lookup_intent_flag(oit->flags);
+               it->it_flags = ll_namei_to_lookup_intent_flag(oit->flags &
+                                               ~(is_readonly ? O_CREAT : 0));
+               it->it_flags &= ~MDS_OPEN_FL_INTERNAL;
        } else {
                it->it_op = IT_GETATTR;
        }
@@ -731,38 +1128,47 @@ struct lookup_intent *ll_convert_intent(struct open_intent *oit,
 static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry,
                                    struct nameidata *nd)
 {
-        struct dentry *de;
-        ENTRY;
+       struct dentry *de;
+       ENTRY;
 
-        if (nd && !(nd->flags & (LOOKUP_CONTINUE|LOOKUP_PARENT))) {
-                struct lookup_intent *it;
+       if (nd && !(nd->flags & (LOOKUP_CONTINUE|LOOKUP_PARENT))) {
+               struct lookup_intent *it;
 
-                if (ll_d2d(dentry) && ll_d2d(dentry)->lld_it) {
-                        it = ll_d2d(dentry)->lld_it;
-                        ll_d2d(dentry)->lld_it = NULL;
-                } else {
+               if (ll_d2d(dentry) && ll_d2d(dentry)->lld_it) {
+                       it = ll_d2d(dentry)->lld_it;
+                       ll_d2d(dentry)->lld_it = NULL;
+               } else {
+                       /*
+                        * Optimize away (CREATE && !OPEN). Let .create handle
+                        * the race. But only if we have write permissions
+                        * there, otherwise we need to proceed with lookup.
+                        * LU-4185
+                        */
                        if ((nd->flags & LOOKUP_CREATE) &&
-                           !(nd->flags & LOOKUP_OPEN))
-                                RETURN(NULL);
-
-                        it = ll_convert_intent(&nd->intent.open, nd->flags);
-                        if (IS_ERR(it))
-                                RETURN((struct dentry *)it);
-                }
-
-                de = ll_lookup_it(parent, dentry, it, nd->flags);
-                if (de)
-                        dentry = de;
-                if ((nd->flags & LOOKUP_OPEN) && !IS_ERR(dentry)) { /* Open */
-                        if (dentry->d_inode &&
-                            it_disposition(it, DISP_OPEN_OPEN)) { /* nocreate */
-                                if (S_ISFIFO(dentry->d_inode->i_mode)) {
-                                        // We cannot call open here as it would
-                                        // deadlock.
-                                        ptlrpc_req_finished(
-                                                       (struct ptlrpc_request *)
-                                                          it->d.lustre.it_data);
-                                } else {
+                           !(nd->flags & LOOKUP_OPEN) &&
+                           (inode_permission(parent,
+                                             MAY_WRITE | MAY_EXEC) == 0))
+                               RETURN(NULL);
+
+                       it = ll_convert_intent(&nd->intent.open, nd->flags,
+                               (nd->path.mnt->mnt_flags & MNT_READONLY) ||
+                               (nd->path.mnt->mnt_sb->s_flags & SB_RDONLY));
+                       if (IS_ERR(it))
+                               RETURN((struct dentry *)it);
+               }
+
+               de = ll_lookup_it(parent, dentry, it, NULL, NULL, NULL);
+               if (de)
+                       dentry = de;
+               if ((nd->flags & LOOKUP_OPEN) && !IS_ERR(dentry)) { /* Open */
+                       if (dentry->d_inode &&
+                           it_disposition(it, DISP_OPEN_OPEN)) { /* nocreate */
+                               if (S_ISFIFO(dentry->d_inode->i_mode)) {
+                                       /* We cannot call open here as it might
+                                        * deadlock. This case is unreachable in
+                                        * practice because of
+                                        * OBD_CONNECT_NODEVOH. */
+                               } else {
                                        struct file *filp;
 
                                        nd->intent.open.file->private_data = it;
@@ -774,35 +1180,32 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry,
                                                        dput(de);
                                                de = (struct dentry *)filp;
                                        }
-                                }
-                        } else if (it_disposition(it, DISP_OPEN_CREATE)) {
-                                // XXX This can only reliably work on assumption
-                                // that there are NO hashed negative dentries.
-                                ll_d2d(dentry)->lld_it = it;
-                                it = NULL; /* Will be freed in ll_create_nd */
-                                /* We absolutely depend on ll_create_nd to be
-                                 * called to not leak this intent and possible
-                                 * data attached to it */
-                        }
-                }
-
-                if (it) {
-                        ll_intent_release(it);
-                        OBD_FREE(it, sizeof(*it));
-                }
-        } else {
-                de = ll_lookup_it(parent, dentry, NULL, 0);
-        }
+                               }
+                       } else if (it_disposition(it, DISP_OPEN_CREATE)) {
+                               /* XXX This can only reliably work on assumption
+                                * that there are NO hashed negative dentries.*/
+                               ll_d2d(dentry)->lld_it = it;
+                               it = NULL; /* Will be freed in ll_create_nd */
+                               /* We absolutely depend on ll_create_nd to be
+                                * called to not leak this intent and possible
+                                * data attached to it */
+                       }
+               }
+
+               if (it) {
+                       ll_intent_release(it);
+                       OBD_FREE(it, sizeof(*it));
+               }
+       } else {
+               de = ll_lookup_it(parent, dentry, NULL, NULL, NULL, NULL);
+       }
 
-        RETURN(de);
+       RETURN(de);
 }
 #endif /* HAVE_IOP_ATOMIC_OPEN */
 
 /* We depend on "mode" being set with the proper file type/umask by now */
-static struct inode *ll_create_node(struct inode *dir, const char *name,
-                                    int namelen, const void *data, int datalen,
-                                    int mode, __u64 extra,
-                                    struct lookup_intent *it)
+static struct inode *ll_create_node(struct inode *dir, struct lookup_intent *it)
 {
         struct inode *inode = NULL;
         struct ptlrpc_request *request = NULL;
@@ -810,16 +1213,17 @@ static struct inode *ll_create_node(struct inode *dir, const char *name,
         int rc;
         ENTRY;
 
-        LASSERT(it && it->d.lustre.it_disposition);
+       LASSERT(it && it->it_disposition);
 
-        LASSERT(it_disposition(it, DISP_ENQ_CREATE_REF));
-        request = it->d.lustre.it_data;
+       LASSERT(it_disposition(it, DISP_ENQ_CREATE_REF));
+       request = it->it_request;
         it_clear_disposition(it, DISP_ENQ_CREATE_REF);
         rc = ll_prep_inode(&inode, request, dir->i_sb, it);
         if (rc)
                 GOTO(out, inode = ERR_PTR(rc));
 
-       LASSERT(ll_d_hlist_empty(&inode->i_dentry));
+       /* Pause to allow for a race with concurrent access by fid */
+       OBD_FAIL_TIMEOUT(OBD_FAIL_LLITE_CREATE_NODE_PAUSE, cfs_fail_val);
 
         /* We asked for a lock on the directory, but were granted a
          * lock on the inode.  Since we finally have an inode pointer,
@@ -847,10 +1251,12 @@ static struct inode *ll_create_node(struct inode *dir, const char *name,
  * If the create succeeds, we fill in the inode information
  * with d_instantiate().
  */
-static int ll_create_it(struct inode *dir, struct dentry *dentry, int mode,
-                       struct lookup_intent *it)
+static int ll_create_it(struct inode *dir, struct dentry *dentry,
+                       struct lookup_intent *it,
+                       void *secctx, __u32 secctxlen)
 {
        struct inode *inode;
+       __u64 bits = 0;
        int rc = 0;
        ENTRY;
 
@@ -862,41 +1268,61 @@ static int ll_create_it(struct inode *dir, struct dentry *dentry, int mode,
        if (rc)
                RETURN(rc);
 
-       inode = ll_create_node(dir, dentry->d_name.name, dentry->d_name.len,
-                              NULL, 0, mode, 0, it);
+       inode = ll_create_node(dir, it);
        if (IS_ERR(inode))
                RETURN(PTR_ERR(inode));
 
-       if (filename_is_volatile(dentry->d_name.name, dentry->d_name.len, NULL))
-               ll_i2info(inode)->lli_volatile = true;
+       if ((ll_i2sbi(inode)->ll_flags & LL_SBI_FILE_SECCTX) &&
+           secctx != NULL) {
+               inode_lock(inode);
+               /* must be done before d_instantiate, because it calls
+                * security_d_instantiate, which means a getxattr if security
+                * context is not set yet */
+               rc = security_inode_notifysecctx(inode, secctx, secctxlen);
+               inode_unlock(inode);
+               if (rc)
+                       RETURN(rc);
+       }
 
        d_instantiate(dentry, inode);
+
+       if (!(ll_i2sbi(inode)->ll_flags & LL_SBI_FILE_SECCTX)) {
+               rc = ll_inode_init_security(dentry, inode, dir);
+               if (rc)
+                       RETURN(rc);
+       }
+
+       ll_set_lock_data(ll_i2sbi(dir)->ll_md_exp, inode, it, &bits);
+       if (bits & MDS_INODELOCK_LOOKUP)
+               d_lustre_revalidate(dentry);
+
        RETURN(0);
 }
 
-static void ll_update_times(struct ptlrpc_request *request,
-                            struct inode *inode)
+void ll_update_times(struct ptlrpc_request *request, struct inode *inode)
 {
-        struct mdt_body *body = req_capsule_server_get(&request->rq_pill,
-                                                       &RMF_MDT_BODY);
-
-        LASSERT(body);
-        if (body->valid & OBD_MD_FLMTIME &&
-            body->mtime > LTIME_S(inode->i_mtime)) {
-               CDEBUG(D_INODE, "setting fid "DFID" mtime from %lu to "LPU64
-                               "\n", PFID(ll_inode2fid(inode)),
-                               LTIME_S(inode->i_mtime), body->mtime);
-                LTIME_S(inode->i_mtime) = body->mtime;
-        }
-        if (body->valid & OBD_MD_FLCTIME &&
-            body->ctime > LTIME_S(inode->i_ctime))
-                LTIME_S(inode->i_ctime) = body->ctime;
+       struct mdt_body *body = req_capsule_server_get(&request->rq_pill,
+                                                      &RMF_MDT_BODY);
+
+       LASSERT(body);
+       if (body->mbo_valid & OBD_MD_FLMTIME &&
+           body->mbo_mtime > inode->i_mtime.tv_sec) {
+               CDEBUG(D_INODE,
+                      "setting fid " DFID " mtime from %lld to %llu\n",
+                      PFID(ll_inode2fid(inode)),
+                      (s64)inode->i_mtime.tv_sec, body->mbo_mtime);
+               inode->i_mtime.tv_sec = body->mbo_mtime;
+       }
+
+       if (body->mbo_valid & OBD_MD_FLCTIME &&
+           body->mbo_ctime > inode->i_ctime.tv_sec)
+               inode->i_ctime.tv_sec = body->mbo_ctime;
 }
 
-static int ll_new_node(struct inode *dir, struct qstr *name,
-                       const char *tgt, int mode, int rdev,
-                       struct dentry *dchild, __u32 opc)
+static int ll_new_node(struct inode *dir, struct dentry *dchild,
+                      const char *tgt, umode_t mode, int rdev, __u32 opc)
 {
+       struct qstr *name = &dchild->d_name;
         struct ptlrpc_request *request = NULL;
         struct md_op_data *op_data;
         struct inode *inode = NULL;
@@ -908,38 +1334,135 @@ static int ll_new_node(struct inode *dir, struct qstr *name,
         if (unlikely(tgt != NULL))
                 tgt_len = strlen(tgt) + 1;
 
-        op_data = ll_prep_md_op_data(NULL, dir, NULL, name->name,
-                                     name->len, 0, opc, NULL);
-        if (IS_ERR(op_data))
-                GOTO(err_exit, err = PTR_ERR(op_data));
+again:
+       op_data = ll_prep_md_op_data(NULL, dir, NULL, name->name,
+                                    name->len, 0, opc, NULL);
+       if (IS_ERR(op_data))
+               GOTO(err_exit, err = PTR_ERR(op_data));
+
+       if (sbi->ll_flags & LL_SBI_FILE_SECCTX) {
+               err = ll_dentry_init_security(dchild, mode, &dchild->d_name,
+                                             &op_data->op_file_secctx_name,
+                                             &op_data->op_file_secctx,
+                                             &op_data->op_file_secctx_size);
+               if (err < 0)
+                       GOTO(err_exit, err);
+       }
 
        err = md_create(sbi->ll_md_exp, op_data, tgt, tgt_len, mode,
-                       current_fsuid(), current_fsgid(),
+                       from_kuid(&init_user_ns, current_fsuid()),
+                       from_kgid(&init_user_ns, current_fsgid()),
                        cfs_curproc_cap_pack(), rdev, &request);
-       ll_finish_md_op_data(op_data);
-        if (err)
-                GOTO(err_exit, err);
+#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;
+               int                     lumsize;
+               int                     err2;
+
+               ptlrpc_req_finished(request);
+               request = NULL;
+
+               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) {
+                       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.
+                        */
+                       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);
+               }
 
-        ll_update_times(request, dir);
+               ptlrpc_req_finished(request);
+               request = NULL;
+               goto again;
+       }
+#endif
 
-        if (dchild) {
-                err = ll_prep_inode(&inode, request, dchild->d_sb, NULL);
-                if (err)
-                     GOTO(err_exit, err);
+       if (err < 0)
+               GOTO(err_exit, err);
 
-                d_instantiate(dchild, inode);
-        }
-        EXIT;
+       ll_update_times(request, dir);
+
+       CFS_FAIL_TIMEOUT(OBD_FAIL_LLITE_NEWNODE_PAUSE, cfs_fail_val);
+
+       err = ll_prep_inode(&inode, request, dchild->d_sb, NULL);
+       if (err)
+               GOTO(err_exit, err);
+
+       if (sbi->ll_flags & LL_SBI_FILE_SECCTX) {
+               inode_lock(inode);
+               /* must be done before d_instantiate, because it calls
+                * security_d_instantiate, which means a getxattr if security
+                * context is not set yet */
+               err = security_inode_notifysecctx(inode,
+                                                 op_data->op_file_secctx,
+                                                 op_data->op_file_secctx_size);
+               inode_unlock(inode);
+               if (err)
+                       GOTO(err_exit, err);
+       }
+
+       d_instantiate(dchild, inode);
+
+       if (!(sbi->ll_flags & LL_SBI_FILE_SECCTX)) {
+               err = ll_inode_init_security(dchild, inode, dir);
+               if (err)
+                       GOTO(err_exit, err);
+       }
+
+       EXIT;
 err_exit:
-        ptlrpc_req_finished(request);
+       if (request != NULL)
+               ptlrpc_req_finished(request);
 
-        return err;
+       if (!IS_ERR_OR_NULL(op_data))
+               ll_finish_md_op_data(op_data);
+
+       return err;
 }
 
-static int ll_mknod_generic(struct inode *dir, struct qstr *name, int mode,
-                            unsigned rdev, struct dentry *dchild)
+static int ll_mknod(struct inode *dir, struct dentry *dchild, ll_umode_t mode,
+                   dev_t rdev)
 {
-        int err;
+       struct qstr *name = &dchild->d_name;
+       int err;
         ENTRY;
 
        CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p) mode %o dev %x\n",
@@ -957,8 +1480,8 @@ static int ll_mknod_generic(struct inode *dir, struct qstr *name, int mode,
         case S_IFBLK:
         case S_IFIFO:
         case S_IFSOCK:
-                err = ll_new_node(dir, name, NULL, mode, rdev, dchild,
-                                  LUSTRE_OPC_MKNOD);
+               err = ll_new_node(dir, dchild, NULL, mode, old_encode_dev(rdev),
+                                 LUSTRE_OPC_MKNOD);
                 break;
         case S_IFDIR:
                 err = -EPERM;
@@ -982,12 +1505,16 @@ static int ll_create_nd(struct inode *dir, struct dentry *dentry,
 {
        int rc;
 
+       CFS_FAIL_TIMEOUT(OBD_FAIL_LLITE_CREATE_FILE_PAUSE, cfs_fail_val);
+
        CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p), "
                           "flags=%u, excl=%d\n", dentry->d_name.len,
               dentry->d_name.name, PFID(ll_inode2fid(dir)),
               dir, mode, want_excl);
 
-       rc = ll_mknod_generic(dir, &dentry->d_name, mode, 0, dentry);
+       /* Using mknod(2) to create a regular file is designed to not recognize
+        * volatile file name, so we use ll_mknod() here. */
+       rc = ll_mknod(dir, dentry, mode, 0);
 
        ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_CREATE, 1);
 
@@ -1002,24 +1529,33 @@ static int ll_create_nd(struct inode *dir, struct dentry *dentry,
 {
        struct ll_dentry_data *lld = ll_d2d(dentry);
        struct lookup_intent *it = NULL;
-        int rc;
+       int rc;
+
+       CFS_FAIL_TIMEOUT(OBD_FAIL_LLITE_CREATE_FILE_PAUSE, cfs_fail_val);
 
        if (lld != NULL)
                it = lld->lld_it;
 
-        if (!it)
-                return ll_mknod_generic(dir, &dentry->d_name, mode, 0, dentry);
+       if (!it) {
+               /* LU-8559: use LUSTRE_OPC_CREATE for non atomic open case
+                * so that volatile file name is recoginized.
+                * Mknod(2), however, is designed to not recognize volatile
+                * file name to avoid inode leak under orphan directory until
+                * MDT reboot */
+               return ll_new_node(dir, dentry, NULL, mode, 0,
+                                  LUSTRE_OPC_CREATE);
+       }
 
        lld->lld_it = NULL;
 
-        /* Was there an error? Propagate it! */
-        if (it->d.lustre.it_status) {
-                rc = it->d.lustre.it_status;
-                goto out;
-        }
+       /* Was there an error? Propagate it! */
+       if (it->it_status) {
+               rc = it->it_status;
+               goto out;
+       }
 
-        rc = ll_create_it(dir, dentry, mode, it);
-        if (nd && (nd->flags & LOOKUP_OPEN) && dentry->d_inode) { /* Open */
+       rc = ll_create_it(dir, dentry, it, NULL, 0);
+       if (nd && (nd->flags & LOOKUP_OPEN) && dentry->d_inode) { /* Open */
                struct file *filp;
 
                nd->intent.open.file->private_data = it;
@@ -1039,18 +1575,19 @@ out:
 }
 #endif /* HAVE_IOP_ATOMIC_OPEN */
 
-static int ll_symlink_generic(struct inode *dir, struct qstr *name,
-                              const char *tgt, struct dentry *dchild)
+static int ll_symlink(struct inode *dir, struct dentry *dchild,
+                     const char *oldpath)
 {
-        int err;
-        ENTRY;
+       struct qstr *name = &dchild->d_name;
+       int err;
+       ENTRY;
 
        CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p), target=%.*s\n",
               name->len, name->name, PFID(ll_inode2fid(dir)),
-              dir, 3000, tgt);
+              dir, 3000, oldpath);
 
-        err = ll_new_node(dir, name, (char *)tgt, S_IFLNK | S_IRWXUGO,
-                          0, dchild, LUSTRE_OPC_SYMLINK);
+       err = ll_new_node(dir, dchild, oldpath, S_IFLNK | S_IRWXUGO, 0,
+                         LUSTRE_OPC_SYMLINK);
 
         if (!err)
                 ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_SYMLINK, 1);
@@ -1058,17 +1595,19 @@ static int ll_symlink_generic(struct inode *dir, struct qstr *name,
         RETURN(err);
 }
 
-static int ll_link_generic(struct inode *src,  struct inode *dir,
-                           struct qstr *name, struct dentry *dchild)
+static int ll_link(struct dentry *old_dentry, struct inode *dir,
+                  struct dentry *new_dentry)
 {
-        struct ll_sb_info *sbi = ll_i2sbi(dir);
-        struct ptlrpc_request *request = NULL;
-        struct md_op_data *op_data;
-        int err;
+       struct inode *src = old_dentry->d_inode;
+       struct qstr *name = &new_dentry->d_name;
+       struct ll_sb_info *sbi = ll_i2sbi(dir);
+       struct ptlrpc_request *request = NULL;
+       struct md_op_data *op_data;
+       int err;
 
-        ENTRY;
-       CDEBUG(D_VFSTRACE, "VFS Op: inode="DFID"(%p), dir="DFID
-              "(%p), target=%.*s\n", PFID(ll_inode2fid(src)), src,
+       ENTRY;
+       CDEBUG(D_VFSTRACE, "VFS Op: inode="DFID"(%p), dir="DFID"(%p), "
+              "target=%.*s\n", PFID(ll_inode2fid(src)), src,
               PFID(ll_inode2fid(dir)), dir, name->len, name->name);
 
         op_data = ll_prep_md_op_data(NULL, src, dir, name->name, name->len,
@@ -1089,10 +1628,9 @@ out:
         RETURN(err);
 }
 
-static int ll_mkdir_generic(struct inode *dir, struct qstr *name,
-                            int mode, struct dentry *dchild)
-
+static int ll_mkdir(struct inode *dir, struct dentry *dchild, ll_umode_t mode)
 {
+       struct qstr *name = &dchild->d_name;
         int err;
         ENTRY;
 
@@ -1101,18 +1639,19 @@ static int ll_mkdir_generic(struct inode *dir, struct qstr *name,
 
        if (!IS_POSIXACL(dir) || !exp_connect_umask(ll_i2mdexp(dir)))
                mode &= ~current_umask();
+
        mode = (mode & (S_IRWXUGO|S_ISVTX)) | S_IFDIR;
-       err = ll_new_node(dir, name, NULL, mode, 0, dchild, LUSTRE_OPC_MKDIR);
 
-        if (!err)
-                ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_MKDIR, 1);
+       err = ll_new_node(dir, dchild, NULL, mode, 0, LUSTRE_OPC_MKDIR);
+       if (err == 0)
+               ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_MKDIR, 1);
 
-        RETURN(err);
+       RETURN(err);
 }
 
-static int ll_rmdir_generic(struct inode *dir, struct dentry *dparent,
-                            struct dentry *dchild, struct qstr *name)
+static int ll_rmdir(struct inode *dir, struct dentry *dchild)
 {
+       struct qstr *name = &dchild->d_name;
         struct ptlrpc_request *request = NULL;
         struct md_op_data *op_data;
         int rc;
@@ -1121,7 +1660,7 @@ static int ll_rmdir_generic(struct inode *dir, struct dentry *dparent,
        CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p)\n",
               name->len, name->name, PFID(ll_inode2fid(dir)), dir);
 
-        if (unlikely(ll_d_mountpoint(dparent, dchild, name)))
+       if (unlikely(d_mountpoint(dchild)))
                 RETURN(-EBUSY);
 
         op_data = ll_prep_md_op_data(NULL, dir, NULL, name->name, name->len,
@@ -1129,8 +1668,9 @@ static int ll_rmdir_generic(struct inode *dir, struct dentry *dparent,
         if (IS_ERR(op_data))
                 RETURN(PTR_ERR(op_data));
 
-       if (dchild != NULL && dchild->d_inode != NULL)
+       if (dchild->d_inode != NULL)
                op_data->op_fid3 = *ll_inode2fid(dchild->d_inode);
+
        op_data->op_fid2 = op_data->op_fid3;
         rc = md_unlink(ll_i2sbi(dir)->ll_md_exp, op_data, &request);
         ll_finish_md_op_data(op_data);
@@ -1172,110 +1712,30 @@ int ll_rmdir_entry(struct inode *dir, char *name, int namelen)
        RETURN(rc);
 }
 
-int ll_objects_destroy(struct ptlrpc_request *request, struct inode *dir)
+static int ll_unlink(struct inode *dir, struct dentry *dchild)
 {
-        struct mdt_body *body;
-        struct lov_mds_md *eadata;
-        struct lov_stripe_md *lsm = NULL;
-        struct obd_trans_info oti = { 0 };
-        struct obdo *oa;
-        struct obd_capa *oc = NULL;
-        int rc;
-        ENTRY;
-
-        /* req is swabbed so this is safe */
-        body = req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY);
-        if (!(body->valid & OBD_MD_FLEASIZE))
-                RETURN(0);
-
-        if (body->eadatasize == 0) {
-                CERROR("OBD_MD_FLEASIZE set but eadatasize zero\n");
-                GOTO(out, rc = -EPROTO);
-        }
-
-        /* The MDS sent back the EA because we unlinked the last reference
-         * to this file. Use this EA to unlink the objects on the OST.
-         * It's opaque so we don't swab here; we leave it to obd_unpackmd() to
-         * check it is complete and sensible. */
-        eadata = req_capsule_server_sized_get(&request->rq_pill, &RMF_MDT_MD,
-                                              body->eadatasize);
-        LASSERT(eadata != NULL);
-
-        rc = obd_unpackmd(ll_i2dtexp(dir), &lsm, eadata, body->eadatasize);
-        if (rc < 0) {
-                CERROR("obd_unpackmd: %d\n", rc);
-                GOTO(out, rc);
-        }
-        LASSERT(rc >= sizeof(*lsm));
-
-        OBDO_ALLOC(oa);
-        if (oa == NULL)
-                GOTO(out_free_memmd, rc = -ENOMEM);
-
-       oa->o_oi = lsm->lsm_oi;
-        oa->o_mode = body->mode & S_IFMT;
-        oa->o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLGROUP;
-
-        if (body->valid & OBD_MD_FLCOOKIE) {
-                oa->o_valid |= OBD_MD_FLCOOKIE;
-                oti.oti_logcookies =
-                        req_capsule_server_sized_get(&request->rq_pill,
-                                                     &RMF_LOGCOOKIES,
-                                                   sizeof(struct llog_cookie) *
-                                                     lsm->lsm_stripe_count);
-                if (oti.oti_logcookies == NULL) {
-                        oa->o_valid &= ~OBD_MD_FLCOOKIE;
-                        body->valid &= ~OBD_MD_FLCOOKIE;
-                }
-        }
-
-        if (body->valid & OBD_MD_FLOSSCAPA) {
-                rc = md_unpack_capa(ll_i2mdexp(dir), request, &RMF_CAPA2, &oc);
-                if (rc)
-                        GOTO(out_free_memmd, rc);
-        }
-
-       rc = obd_destroy(NULL, ll_i2dtexp(dir), oa, lsm, &oti,
-                        ll_i2mdexp(dir), oc);
-       capa_put(oc);
-       if (rc)
-               CERROR("obd destroy objid "DOSTID" error %d\n",
-                      POSTID(&lsm->lsm_oi), rc);
-out_free_memmd:
-       obd_free_memmd(ll_i2dtexp(dir), &lsm);
-       OBDO_FREE(oa);
-out:
-       return rc;
-}
-
-/* ll_unlink_generic() doesn't update the inode with the new link count.
- * Instead, ll_ddelete() and ll_d_iput() will update it based upon if there
- * is any lock existing. They will recycle dentries and inodes based upon locks
- * too. b=20433 */
-static int ll_unlink_generic(struct inode *dir, struct dentry *dparent,
-                             struct dentry *dchild, struct qstr *name)
-{
-        struct ptlrpc_request *request = NULL;
-        struct md_op_data *op_data;
-        int rc;
-        ENTRY;
+       struct qstr *name = &dchild->d_name;
+       struct ptlrpc_request *request = NULL;
+       struct md_op_data *op_data;
+       struct mdt_body *body;
+       int rc;
+       ENTRY;
        CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p)\n",
               name->len, name->name, PFID(ll_inode2fid(dir)), dir);
 
-        /*
-         * XXX: unlink bind mountpoint maybe call to here,
-         * just check it as vfs_unlink does.
-         */
-        if (unlikely(ll_d_mountpoint(dparent, dchild, name)))
-                RETURN(-EBUSY);
+       /*
+        * XXX: unlink bind mountpoint maybe call to here,
+        * just check it as vfs_unlink does.
+        */
+       if (unlikely(d_mountpoint(dchild)))
+               RETURN(-EBUSY);
 
-        op_data = ll_prep_md_op_data(NULL, dir, NULL, name->name,
-                                     name->len, 0, LUSTRE_OPC_ANY, NULL);
-        if (IS_ERR(op_data))
-                RETURN(PTR_ERR(op_data));
+       op_data = ll_prep_md_op_data(NULL, dir, NULL, name->name, name->len, 0,
+                                    LUSTRE_OPC_ANY, NULL);
+       if (IS_ERR(op_data))
+               RETURN(PTR_ERR(op_data));
 
-       if (dchild != NULL && dchild->d_inode != NULL)
-               op_data->op_fid3 = *ll_inode2fid(dchild->d_inode);
+       op_data->op_fid3 = *ll_inode2fid(dchild->d_inode);
 
        op_data->op_fid2 = op_data->op_fid3;
        rc = md_unlink(ll_i2sbi(dir)->ll_md_exp, op_data, &request);
@@ -1283,43 +1743,60 @@ static int ll_unlink_generic(struct inode *dir, struct dentry *dparent,
        if (rc)
                GOTO(out, rc);
 
-        ll_update_times(request, dir);
-        ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_UNLINK, 1);
+       /*
+        * The server puts attributes in on the last unlink, use them to update
+        * the link count so the inode can be freed immediately.
+        */
+       body = req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY);
+       if (body->mbo_valid & OBD_MD_FLNLINK)
+               set_nlink(dchild->d_inode, body->mbo_nlink);
 
-        rc = ll_objects_destroy(request, dir);
- out:
-        ptlrpc_req_finished(request);
-        RETURN(rc);
+       ll_update_times(request, dir);
+       ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_UNLINK, 1);
+
+out:
+       ptlrpc_req_finished(request);
+       RETURN(rc);
 }
 
-static int ll_rename_generic(struct inode *src, struct dentry *src_dparent,
-                             struct dentry *src_dchild, struct qstr *src_name,
-                             struct inode *tgt, struct dentry *tgt_dparent,
-                             struct dentry *tgt_dchild, struct qstr *tgt_name)
+static int ll_rename(struct inode *src, struct dentry *src_dchild,
+                    struct inode *tgt, struct dentry *tgt_dchild
+#ifdef HAVE_IOPS_RENAME_WITH_FLAGS
+                    , unsigned int flags
+#endif
+                    )
 {
-        struct ptlrpc_request *request = NULL;
-        struct ll_sb_info *sbi = ll_i2sbi(src);
-        struct md_op_data *op_data;
-        int err;
-        ENTRY;
+       struct qstr *src_name = &src_dchild->d_name;
+       struct qstr *tgt_name = &tgt_dchild->d_name;
+       struct ptlrpc_request *request = NULL;
+       struct ll_sb_info *sbi = ll_i2sbi(src);
+       struct md_op_data *op_data;
+       int err;
+       ENTRY;
+
+#ifdef HAVE_IOPS_RENAME_WITH_FLAGS
+       if (flags)
+               return -EINVAL;
+#endif
+
        CDEBUG(D_VFSTRACE, "VFS Op:oldname=%.*s, src_dir="DFID
               "(%p), newname=%.*s, tgt_dir="DFID"(%p)\n",
               src_name->len, src_name->name,
               PFID(ll_inode2fid(src)), src, tgt_name->len,
               tgt_name->name, PFID(ll_inode2fid(tgt)), tgt);
 
-        if (unlikely(ll_d_mountpoint(src_dparent, src_dchild, src_name) ||
-            ll_d_mountpoint(tgt_dparent, tgt_dchild, tgt_name)))
-                RETURN(-EBUSY);
+       if (unlikely(d_mountpoint(src_dchild) || d_mountpoint(tgt_dchild)))
+               RETURN(-EBUSY);
 
-        op_data = ll_prep_md_op_data(NULL, src, tgt, NULL, 0, 0,
-                                     LUSTRE_OPC_ANY, NULL);
-        if (IS_ERR(op_data))
-                RETURN(PTR_ERR(op_data));
+       op_data = ll_prep_md_op_data(NULL, src, tgt, NULL, 0, 0,
+                                    LUSTRE_OPC_ANY, NULL);
+       if (IS_ERR(op_data))
+               RETURN(PTR_ERR(op_data));
 
-       if (src_dchild != NULL && src_dchild->d_inode != NULL)
+       if (src_dchild->d_inode != NULL)
                op_data->op_fid3 = *ll_inode2fid(src_dchild->d_inode);
-       if (tgt_dchild != NULL && tgt_dchild->d_inode != NULL)
+
+       if (tgt_dchild->d_inode != NULL)
                op_data->op_fid4 = *ll_inode2fid(tgt_dchild->d_inode);
 
         err = md_rename(sbi->ll_md_exp, op_data,
@@ -1330,97 +1807,61 @@ static int ll_rename_generic(struct inode *src, struct dentry *src_dparent,
                 ll_update_times(request, src);
                 ll_update_times(request, tgt);
                 ll_stats_ops_tally(sbi, LPROC_LL_RENAME, 1);
-                err = ll_objects_destroy(request, src);
         }
 
         ptlrpc_req_finished(request);
 
-        RETURN(err);
-}
-
-static int ll_mknod(struct inode *dir, struct dentry *dchild, ll_umode_t mode,
-                   dev_t rdev)
-{
-       return ll_mknod_generic(dir, &dchild->d_name, mode,
-                               old_encode_dev(rdev), dchild);
-}
-
-static int ll_unlink(struct inode * dir, struct dentry *dentry)
-{
-        return ll_unlink_generic(dir, NULL, dentry, &dentry->d_name);
-}
-
-static int ll_mkdir(struct inode *dir, struct dentry *dentry, ll_umode_t mode)
-{
-        return ll_mkdir_generic(dir, &dentry->d_name, mode, dentry);
-}
-
-static int ll_rmdir(struct inode *dir, struct dentry *dentry)
-{
-        return ll_rmdir_generic(dir, NULL, dentry, &dentry->d_name);
-}
+       if (err == 0)
+               d_move(src_dchild, tgt_dchild);
 
-static int ll_symlink(struct inode *dir, struct dentry *dentry,
-                      const char *oldname)
-{
-        return ll_symlink_generic(dir, &dentry->d_name, oldname, dentry);
+       RETURN(err);
 }
 
-static int ll_link(struct dentry *old_dentry, struct inode *dir,
-                   struct dentry *new_dentry)
-{
-        return ll_link_generic(old_dentry->d_inode, dir, &new_dentry->d_name,
-                               new_dentry);
-}
-
-static int ll_rename(struct inode *old_dir, struct dentry *old_dentry,
-                     struct inode *new_dir, struct dentry *new_dentry)
-{
-        int err;
-        err = ll_rename_generic(old_dir, NULL,
-                                 old_dentry, &old_dentry->d_name,
-                                 new_dir, NULL, new_dentry,
-                                 &new_dentry->d_name);
-       if (!err)
-                        d_move(old_dentry, new_dentry);
-        return err;
-}
-
-struct inode_operations ll_dir_inode_operations = {
-       .mknod              = ll_mknod,
+const struct inode_operations ll_dir_inode_operations = {
+       .mknod          = ll_mknod,
 #ifdef HAVE_IOP_ATOMIC_OPEN
-       .atomic_open        = ll_atomic_open,
+       .atomic_open    = ll_atomic_open,
 #endif
-       .lookup             = ll_lookup_nd,
-       .create             = ll_create_nd,
+       .lookup         = ll_lookup_nd,
+       .create         = ll_create_nd,
        /* We need all these non-raw things for NFSD, to not patch it. */
-       .unlink             = ll_unlink,
-       .mkdir              = ll_mkdir,
-       .rmdir              = ll_rmdir,
-       .symlink            = ll_symlink,
-       .link               = ll_link,
-       .rename             = ll_rename,
-       .setattr            = ll_setattr,
-       .getattr            = ll_getattr,
-       .permission         = ll_inode_permission,
-       .setxattr           = ll_setxattr,
-       .getxattr           = ll_getxattr,
-       .listxattr          = ll_listxattr,
-       .removexattr        = ll_removexattr,
+       .unlink         = ll_unlink,
+       .mkdir          = ll_mkdir,
+       .rmdir          = ll_rmdir,
+       .symlink        = ll_symlink,
+       .link           = ll_link,
+       .rename         = ll_rename,
+       .setattr        = ll_setattr,
+       .getattr        = ll_getattr,
+       .permission     = ll_inode_permission,
+#ifdef HAVE_IOP_XATTR
+       .setxattr       = ll_setxattr,
+       .getxattr       = ll_getxattr,
+       .removexattr    = ll_removexattr,
+#endif
+       .listxattr      = ll_listxattr,
 #ifdef HAVE_IOP_GET_ACL
-       .get_acl            = ll_get_acl,
+       .get_acl        = ll_get_acl,
+#endif
+#ifdef HAVE_IOP_SET_ACL
+       .set_acl        = ll_set_acl,
 #endif
 };
 
-struct inode_operations ll_special_inode_operations = {
+const struct inode_operations ll_special_inode_operations = {
        .setattr        = ll_setattr,
        .getattr        = ll_getattr,
        .permission     = ll_inode_permission,
-       .setxattr       = ll_setxattr,
-       .getxattr       = ll_getxattr,
-       .listxattr      = ll_listxattr,
+#ifdef HAVE_IOP_XATTR
+       .setxattr       = ll_setxattr,
+       .getxattr       = ll_getxattr,
        .removexattr    = ll_removexattr,
+#endif
+       .listxattr      = ll_listxattr,
 #ifdef HAVE_IOP_GET_ACL
-       .get_acl            = ll_get_acl,
+       .get_acl        = ll_get_acl,
+#endif
+#ifdef HAVE_IOP_SET_ACL
+       .set_acl        = ll_set_acl,
 #endif
 };