LU-7828 statahead: set sai_index_wait with lli_sa_lock held

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

diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c
index c7494cc..384bd20 100644 (file)
--- a/lustre/llite/statahead.c
+++ b/lustre/llite/statahead.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -659,7 +659,7 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,
        struct ll_statahead_info *sai = lli->lli_sai;
        struct sa_entry *entry = (struct sa_entry *)minfo->mi_cbdata;
        __u64 handle = 0;
-       bool wakeup;
+       wait_queue_head_t *waitq = NULL;
        ENTRY;
 
        if (it_disposition(it, DISP_LOOKUP_NEG))
@@ -689,7 +689,8 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,
 
        spin_lock(&lli->lli_sa_lock);
        if (rc != 0) {
-               wakeup = __sa_make_ready(sai, entry, rc);
+               if (__sa_make_ready(sai, entry, rc))
+                       waitq = &sai->sai_waitq;
        } else {
                entry->se_minfo = minfo;
                entry->se_req = ptlrpc_request_addref(req);
@@ -698,12 +699,14 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,
                 * for readpage and other tries to enqueue lock on child
                 * with parent's lock held, for example: unlink. */
                entry->se_handle = handle;
-               wakeup = !sa_has_callback(sai);
+               if (!sa_has_callback(sai))
+                       waitq = &sai->sai_thread.t_ctl_waitq;
+
                list_add_tail(&entry->se_list, &sai->sai_interim_entries);
        }
        sai->sai_replied++;
-       if (wakeup)
-               wake_up(&sai->sai_thread.t_ctl_waitq);
+       if (waitq != NULL)
+               wake_up(waitq);
        spin_unlock(&lli->lli_sa_lock);
 
        RETURN(rc);
@@ -1396,7 +1399,7 @@ static int revalidate_statahead_dentry(struct inode *dir,
        struct sa_entry *entry = NULL;
        struct l_wait_info lwi = { 0 };
        struct ll_dentry_data *ldd;
-       struct ll_inode_info *lli;
+       struct ll_inode_info *lli = ll_i2info(dir);
        int rc = 0;
        ENTRY;
 
@@ -1439,9 +1442,11 @@ static int revalidate_statahead_dentry(struct inode *dir,
                sa_handle_callback(sai);
 
        if (!sa_ready(entry)) {
+               spin_lock(&lli->lli_sa_lock);
                sai->sai_index_wait = entry->se_index;
+               spin_unlock(&lli->lli_sa_lock);
                lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(30), NULL,
-                                       LWI_ON_SIGNAL_NOOP, NULL);
+                                      LWI_ON_SIGNAL_NOOP, NULL);
                rc = l_wait_event(sai->sai_waitq, sa_ready(entry), &lwi);
                if (rc < 0) {
                        /*
@@ -1467,8 +1472,10 @@ static int revalidate_statahead_dentry(struct inode *dir,
                                struct dentry *alias;
 
                                alias = ll_splice_alias(inode, *dentryp);
-                               if (IS_ERR(alias))
+                               if (IS_ERR(alias)) {
+                                       ll_intent_release(&it);
                                        GOTO(out, rc = PTR_ERR(alias));
+                               }
                                *dentryp = alias;
                                /* statahead prepared this inode, transfer inode
                                 * refcount from sa_entry to dentry */
@@ -1485,6 +1492,7 @@ static int revalidate_statahead_dentry(struct inode *dir,
                                        (*dentryp)->d_name.name,
                                        PFID(ll_inode2fid((*dentryp)->d_inode)),
                                        PFID(ll_inode2fid(inode)));
+                               ll_intent_release(&it);
                                GOTO(out, rc = -ESTALE);
                        }
 
@@ -1503,7 +1511,6 @@ out:
         * dentry_may_statahead().
         */
        ldd = ll_d2d(*dentryp);
-       lli = ll_i2info(dir);
        /* ldd can be NULL if llite lookup failed. */
        if (ldd != NULL)
                ldd->lld_sa_generation = lli->lli_sa_generation;