LU-6142 llite: remove ll_dir_chain

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

diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c
index 7752b45..6745d08 100644 (file)
--- a/lustre/llite/statahead.c
+++ b/lustre/llite/statahead.c
@@ -132,7 +132,7 @@ sa_unhash(struct ll_statahead_info *sai, struct sa_entry *entry)
 static inline int agl_should_run(struct ll_statahead_info *sai,
                                 struct inode *inode)
 {
-       return (inode && S_ISREG(inode->i_mode) && sai->sai_agl_valid);
+       return inode && S_ISREG(inode->i_mode) && sai->sai_agl_task;
 }
 
 static inline struct ll_inode_info *
@@ -432,7 +432,6 @@ static void ll_agl_add(struct ll_statahead_info *sai,
 {
        struct ll_inode_info *child  = ll_i2info(inode);
        struct ll_inode_info *parent = ll_i2info(sai->sai_dentry->d_inode);
-       int                   added  = 0;
 
        spin_lock(&child->lli_agl_lock);
        if (child->lli_agl_index == 0) {
@@ -441,13 +440,15 @@ static void ll_agl_add(struct ll_statahead_info *sai,
 
                LASSERT(list_empty(&child->lli_agl_list));
 
-               igrab(inode);
                spin_lock(&parent->lli_agl_lock);
-               if (agl_list_empty(sai))
-                       added = 1;
-               list_add_tail(&child->lli_agl_list, &sai->sai_agls);
-               if (added && sai->sai_agl_task)
-                       wake_up_process(sai->sai_agl_task);
+               /* Re-check under the lock */
+               if (agl_should_run(sai, inode)) {
+                       if (agl_list_empty(sai))
+                               wake_up_process(sai->sai_agl_task);
+                       igrab(inode);
+                       list_add_tail(&child->lli_agl_list, &sai->sai_agls);
+               } else
+                       child->lli_agl_index = 0;
                spin_unlock(&parent->lli_agl_lock);
        } else {
                spin_unlock(&child->lli_agl_lock);
@@ -957,7 +958,6 @@ static void ll_stop_agl(struct ll_statahead_info *sai)
        kthread_stop(agl_task);
 
        spin_lock(&plli->lli_agl_lock);
-       sai->sai_agl_valid = 0;
        while (!agl_list_empty(sai)) {
                clli = agl_first_entry(sai);
                list_del_init(&clli->lli_agl_list);
@@ -975,8 +975,9 @@ static void ll_stop_agl(struct ll_statahead_info *sai)
 /* start agl thread */
 static void ll_start_agl(struct dentry *parent, struct ll_statahead_info *sai)
 {
-       struct ll_inode_info  *plli;
-       struct task_struct    *task;
+       int node = cfs_cpt_spread_node(cfs_cpt_tab, CFS_CPT_ANY);
+       struct ll_inode_info *plli;
+       struct task_struct *task;
 
        ENTRY;
 
@@ -984,15 +985,13 @@ static void ll_start_agl(struct dentry *parent, struct ll_statahead_info *sai)
               sai, parent);
 
        plli = ll_i2info(parent->d_inode);
-       task = kthread_create(ll_agl_thread, parent,
-                             "ll_agl_%u", plli->lli_opendir_pid);
+       task = kthread_create_on_node(ll_agl_thread, parent, node, "ll_agl_%d",
+                                     plli->lli_opendir_pid);
        if (IS_ERR(task)) {
                CERROR("can't start ll_agl thread, rc: %ld\n", PTR_ERR(task));
-               sai->sai_agl_valid = 0;
                RETURN_EXIT;
        }
        sai->sai_agl_task = task;
-       LASSERT(sai->sai_agl_valid == 1);
        atomic_inc(&ll_i2sbi(d_inode(parent))->ll_agl_total);
        /* Get an extra reference that the thread holds */
        ll_sai_get(d_inode(parent));
@@ -1012,7 +1011,6 @@ static int ll_statahead_thread(void *arg)
        struct ll_statahead_info *sai = lli->lli_sai;
        int first = 0;
        struct md_op_data *op_data;
-       struct ll_dir_chain chain;
        struct page *page = NULL;
        __u64 pos = 0;
        int rc = 0;
@@ -1026,7 +1024,6 @@ static int ll_statahead_thread(void *arg)
        if (!op_data)
                GOTO(out, rc = -ENOMEM);
 
-       ll_dir_chain_init(&chain);
        while (pos != MDS_DIR_END_OFF && sai->sai_task) {
                struct lu_dirpage *dp;
                struct lu_dirent  *ent;
@@ -1039,7 +1036,7 @@ static int ll_statahead_thread(void *arg)
                }
 
                sai->sai_in_readpage = 1;
-               page = ll_get_dir_page(dir, op_data, pos, &chain);
+               page = ll_get_dir_page(dir, op_data, pos);
                ll_unlock_md_op_lsm(op_data);
                sai->sai_in_readpage = 0;
                if (IS_ERR(page)) {
@@ -1152,7 +1149,6 @@ static int ll_statahead_thread(void *arg)
                        break;
                }
        }
-       ll_dir_chain_fini(&chain);
        ll_finish_md_op_data(op_data);
 
        if (rc < 0) {
@@ -1278,7 +1274,6 @@ enum {
 /* file is first dirent under @dir */
 static int is_first_dirent(struct inode *dir, struct dentry *dentry)
 {
-       struct ll_dir_chain   chain;
        struct qstr          *target = &dentry->d_name;
        struct md_op_data    *op_data;
        int                   dot_de;
@@ -1296,8 +1291,7 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
         *FIXME choose the start offset of the readdir
         */
 
-       ll_dir_chain_init(&chain);
-       page = ll_get_dir_page(dir, op_data, 0, &chain);
+       page = ll_get_dir_page(dir, op_data, 0);
 
        while (1) {
                struct lu_dirpage *dp;
@@ -1386,12 +1380,11 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
                         */
                        ll_release_page(dir, page, le32_to_cpu(dp->ldp_flags) &
                                              LDF_COLLIDE);
-                       page = ll_get_dir_page(dir, op_data, pos, &chain);
+                       page = ll_get_dir_page(dir, op_data, pos);
                }
        }
        EXIT;
 out:
-       ll_dir_chain_fini(&chain);
        ll_finish_md_op_data(op_data);
 
        return rc;
@@ -1558,6 +1551,7 @@ out:
 static int start_statahead_thread(struct inode *dir, struct dentry *dentry,
                                  bool agl)
 {
+       int node = cfs_cpt_spread_node(cfs_cpt_tab, CFS_CPT_ANY);
        struct ll_inode_info *lli = ll_i2info(dir);
        struct ll_statahead_info *sai = NULL;
        struct dentry *parent = dentry->d_parent;
@@ -1586,7 +1580,6 @@ static int start_statahead_thread(struct inode *dir, struct dentry *dentry,
                GOTO(out, rc = -ENOMEM);
 
        sai->sai_ls_all = (first == LS_FIRST_DOT_DE);
-       sai->sai_agl_valid = agl;
 
        /*
         * if current lli_opendir_key was deauthorized, or dir re-opened by
@@ -1605,8 +1598,8 @@ static int start_statahead_thread(struct inode *dir, struct dentry *dentry,
        CDEBUG(D_READA, "start statahead thread: [pid %d] [parent %pd]\n",
               current->pid, parent);
 
-       task = kthread_create(ll_statahead_thread, parent, "ll_sa_%u",
-                             lli->lli_opendir_pid);
+       task = kthread_create_on_node(ll_statahead_thread, parent, node,
+                                     "ll_sa_%u", lli->lli_opendir_pid);
        if (IS_ERR(task)) {
                spin_lock(&lli->lli_sa_lock);
                lli->lli_sai = NULL;
@@ -1657,10 +1650,11 @@ static inline bool ll_statahead_started(struct inode *dir, bool agl)
 
        spin_lock(&lli->lli_sa_lock);
        sai = lli->lli_sai;
-       if (sai && sai->sai_agl_valid != agl)
+       if (sai && (sai->sai_agl_task != NULL) != agl)
                CDEBUG(D_READA,
                       "%s: Statahead AGL hint changed from %d to %d\n",
-                      ll_i2sbi(dir)->ll_fsname, sai->sai_agl_valid, agl);
+                      ll_i2sbi(dir)->ll_fsname,
+                      sai->sai_agl_task != NULL, agl);
        spin_unlock(&lli->lli_sa_lock);
 
        return !!sai;