Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix build lustre with o2ib and SLES10.
[fs/lustre-release.git] / lustre / llite / statahead.c
diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c
index 24b245d..6262dd0 100644 (file)
--- a/lustre/llite/statahead.c
+++ b/lustre/llite/statahead.c
@@ -58,6 +58,8 @@ static struct ll_statahead_info *ll_sai_alloc(void)
 
         spin_lock(&sai_generation_lock);
         sai->sai_generation = ++sai_generation;
+        if (unlikely(sai_generation == 0))
+                sai->sai_generation = ++sai_generation;
         spin_unlock(&sai_generation_lock);
         atomic_set(&sai->sai_refcount, 1);
         sai->sai_max = LL_SA_RPC_MIN;
@@ -90,8 +92,8 @@ static void ll_sai_put(struct ll_statahead_info *sai)
                 LASSERT(sai->sai_thread.t_flags & SVC_STOPPED);
 
                 if (sai->sai_sent > sai->sai_replied)
-                        CWARN("statahead for dir %lu/%u does not finish: "
-                              "[sent:%u] [replied:%u]\n",
+                        CDEBUG(D_READA,"statahead for dir %lu/%u does not "
+                              "finish: [sent:%u] [replied:%u]\n",
                               inode->i_ino, inode->i_generation,
                               sai->sai_sent, sai->sai_replied);
 
@@ -455,7 +457,7 @@ static inline void ll_name2qstr(struct qstr *this, const char *name, int namelen
         this->hash = end_name_hash(hash);
 }
 
-static int ll_statahead_one(struct dentry *parent, ext2_dirent *de)
+static int ll_statahead_one(struct dentry *parent, struct ll_dir_entry *de)
 {
         struct inode           *dir = parent->d_inode;
         struct ll_inode_info   *lli = ll_i2info(dir);
@@ -481,7 +483,7 @@ static int ll_statahead_one(struct dentry *parent, ext2_dirent *de)
         if (IS_ERR(se))
                 RETURN(PTR_ERR(se));
 
-        ll_name2qstr(&name, de->name, de->name_len);
+        ll_name2qstr(&name, de->lde_name, de->lde_name_len);
         dentry = d_lookup(parent, &name);
         if (!dentry) {
                 dentry = d_alloc(parent, &name);
@@ -567,7 +569,7 @@ static int ll_statahead_thread(void *arg)
                 struct l_wait_info lwi = { 0 };
                 unsigned long npages;
                 char *kaddr, *limit;
-                ext2_dirent *de;
+                struct ll_dir_entry *de;
                 struct page *page;
 
                 npages = dir_pages(dir);
@@ -588,18 +590,18 @@ static int ll_statahead_thread(void *arg)
                 }
 
                 kaddr = page_address(page);
-                limit = kaddr + CFS_PAGE_SIZE - EXT2_DIR_REC_LEN(1);
-                de = (ext2_dirent *)kaddr;
+                limit = kaddr + CFS_PAGE_SIZE - ll_dir_rec_len(1);
+                de = (struct ll_dir_entry *)kaddr;
                 if (!index) {
-                        de = ext2_next_entry(de); /* skip "." */
-                        de = ext2_next_entry(de); /* skip ".." */
+                        de = ll_dir_next_entry(de); /* skip "." */
+                        de = ll_dir_next_entry(de); /* skip ".." */
                 }
 
-                for (; (char*)de <= limit; de = ext2_next_entry(de)) {
-                        if (!de->inode)
+                for (; (char*)de <= limit; de = ll_dir_next_entry(de)) {
+                        if (!de->lde_inode)
                                 continue;
 
-                        if (de->name[0] == '.' && !sai->sai_ls_all) {
+                        if (de->lde_name[0] == '.' && !sai->sai_ls_all) {
                                 /* skip hidden files */
                                 sai->sai_skip_hidden++;
                                 continue;
@@ -616,17 +618,17 @@ static int ll_statahead_thread(void *arg)
                                      &lwi);
 
                         if (unlikely(sa_check_stop(sai))) {
-                                ext2_put_page(page);
+                                ll_put_page(page);
                                 GOTO(out, rc);
                         }
 
                         rc = ll_statahead_one(parent, de);
                         if (rc < 0) {
-                                ext2_put_page(page);
+                                ll_put_page(page);
                                 GOTO(out, rc);
                         }
                 }
-                ext2_put_page(page);
+                ll_put_page(page);
                 index++;
         }
         EXIT;
@@ -696,12 +698,12 @@ enum {
 
 static int is_first_dirent(struct inode *dir, struct dentry *dentry)
 {
-        struct qstr   *d_name = &dentry->d_name;
-        unsigned long  npages, index = 0;
-        struct page   *page;
-        ext2_dirent   *de;
-        char          *kaddr, *limit;
-        int            rc = LS_NONE_FIRST_DE, dot_de;
+        struct qstr         *d_name = &dentry->d_name;
+        unsigned long        npages, index = 0;
+        struct page         *page;
+        struct ll_dir_entry *de;
+        char                *kaddr, *limit;
+        int                  rc = LS_NONE_FIRST_DE, dot_de;
         ENTRY;
 
         while (1) {
@@ -722,18 +724,29 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
                 }
 
                 kaddr = page_address(page);
-                limit = kaddr + CFS_PAGE_SIZE - EXT2_DIR_REC_LEN(1);
-                de = (ext2_dirent *)kaddr;
+                limit = kaddr + CFS_PAGE_SIZE - ll_dir_rec_len(1);
+                de = (struct ll_dir_entry *)kaddr;
                 if (!index) {
-                        de = ext2_next_entry(de); /* skip "." */
-                        de = ext2_next_entry(de); /* skip ".." */
+                        if (unlikely(!(de->lde_name_len == 1 &&
+                                       strncmp(de->lde_name, ".", 1) == 0)))
+                                CWARN("Maybe got bad on-disk dir: %lu\n",
+                                      dir->i_ino);
+                        /* skip "." or ingore bad entry */
+                        de = ll_dir_next_entry(de);
+
+                        if (unlikely(!(de->lde_name_len == 2 &&
+                                       strncmp(de->lde_name, "..", 2) == 0)))
+                                CWARN("Maybe got bad on-disk dir: %lu\n",
+                                      dir->i_ino);
+                        /* skip ".." or ingore bad entry */
+                        de = ll_dir_next_entry(de);
                 }
 
-                for (; (char*)de <= limit; de = ext2_next_entry(de)) {
-                        if (!de->inode)
+                for (; (char*)de <= limit; de = ll_dir_next_entry(de)) {
+                        if (!de->lde_inode)
                                 continue;
 
-                        if (de->name[0] == '.')
+                        if (de->lde_name[0] == '.')
                                 dot_de = 1;
                         else
                                 dot_de = 0;
@@ -741,19 +754,19 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
                         if (dot_de && d_name->name[0] != '.') {
                                 CDEBUG(D_READA, "%.*s skip hidden file %.*s\n",
                                        d_name->len, d_name->name,
-                                       de->name_len, de->name);
+                                       de->lde_name_len, de->lde_name);
                                 continue;
                         }
 
-                        if (d_name->len == de->name_len &&
-                            !strncmp(d_name->name, de->name, d_name->len))
+                        if (d_name->len == de->lde_name_len &&
+                            !strncmp(d_name->name, de->lde_name, d_name->len))
                                 rc = LS_FIRST_DE + dot_de;
                         else
                                 rc = LS_NONE_FIRST_DE;
-                        ext2_put_page(page);
+                        ll_put_page(page);
                         RETURN(rc);
                 }
-                ext2_put_page(page);
+                ll_put_page(page);
                 index++;
         }
         RETURN(rc);
@@ -886,9 +899,10 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup)
 /* update hit/miss count */
 void ll_statahead_exit(struct dentry *dentry, int result)
 {
-        struct dentry        *parent = dentry->d_parent;
-        struct ll_inode_info *lli = ll_i2info(parent->d_inode);
-        struct ll_sb_info    *sbi = ll_i2sbi(parent->d_inode);
+        struct dentry         *parent = dentry->d_parent;
+        struct ll_inode_info  *lli = ll_i2info(parent->d_inode);
+        struct ll_sb_info     *sbi = ll_i2sbi(parent->d_inode);
+        struct ll_dentry_data *ldd = ll_d2d(dentry);
 
         if (lli->lli_opendir_pid != cfs_curproc_pid())
                 return;
@@ -905,7 +919,8 @@ void ll_statahead_exit(struct dentry *dentry, int result)
                         sbi->ll_sa_miss++;
                         sai->sai_miss++;
                         sai->sai_consecutive_miss++;
-                        if (sa_low_hit(sai)) {
+                        if (sa_low_hit(sai) &&
+                            sai->sai_thread.t_flags & SVC_RUNNING) {
                                 sbi->ll_sa_wrong++;
                                 CDEBUG(D_READA, "statahead for dir %.*s hit "
                                        "ratio too low: hit/miss %u/%u, "
@@ -921,7 +936,11 @@ void ll_statahead_exit(struct dentry *dentry, int result)
                                 spin_unlock(&lli->lli_lock);
                         }
                 }
+
                 cfs_waitq_signal(&sai->sai_thread.t_ctl_waitq);
                 ll_sai_entry_put(sai);
+
+                if (likely(ldd != NULL))
+                        ldd->lld_sa_generation = sai->sai_generation;
         }
 }
Lustre primary development and releases