LU-7403 llite: flatten struct lookup_intent

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

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index c0fa6a9..eabbbab 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -470,7 +470,7 @@ static int ll_lookup_it_finish(struct ptlrpc_request *request,
        /* 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)
@@ -519,7 +519,7 @@ static int ll_lookup_it_finish(struct ptlrpc_request *request,
                /* 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 */
@@ -859,10 +859,10 @@ static struct inode *ll_create_node(struct inode *dir, struct lookup_intent *it)
         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_data;
         it_clear_disposition(it, DISP_ENQ_CREATE_REF);
         rc = ll_prep_inode(&inode, request, dir->i_sb, it);
         if (rc)
@@ -1103,8 +1103,8 @@ static int ll_create_nd(struct inode *dir, struct dentry *dentry,
        lld->lld_it = NULL;
 
         /* Was there an error? Propagate it! */
-        if (it->d.lustre.it_status) {
-                rc = it->d.lustre.it_status;
+       if (it->it_status) {
+               rc = it->it_status;
                 goto out;
         }