LU-3319 procfs: move llite proc handling over to seq_file

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

diff --git a/lustre/llite/vvp_dev.c b/lustre/llite/vvp_dev.c
index 3aadb74..ec31e0c 100644 (file)
--- a/lustre/llite/vvp_dev.c
+++ b/lustre/llite/vvp_dev.c
@@ -36,6 +36,7 @@
  * cl_device and cl_device_type implementation for VVP layer.
  *
  *   Author: Nikita Danilov <nikita.danilov@sun.com>
+ *   Author: Jinshan Xiong <jinshan.xiong@intel.com>
  */
 
 #define DEBUG_SUBSYSTEM S_LLITE
@@ -361,23 +362,18 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
                        return ~0ULL;
                clob = vvp_pgcache_obj(env, dev, &id);
                if (clob != NULL) {
-                       struct cl_object_header *hdr;
-                       int                      nr;
-                       struct cl_page          *pg;
+                       struct inode *inode = ccc_object_inode(clob);
+                       struct page *vmpage;
+                       int nr;
 
-                       /* got an object. Find next page. */
-                       hdr = cl_object_header(clob);
-
-                       spin_lock(&hdr->coh_page_guard);
-                       nr = radix_tree_gang_lookup(&hdr->coh_tree,
-                                                   (void **)&pg,
-                                                   id.vpi_index, 1);
+                       nr = find_get_pages_contig(inode->i_mapping,
+                                                  id.vpi_index, 1, &vmpage);
                        if (nr > 0) {
-                               id.vpi_index = pg->cp_index;
+                               id.vpi_index = vmpage->index;
                                /* Cant support over 16T file */
-                               nr = !(pg->cp_index > 0xffffffff);
+                               nr = !(vmpage->index > 0xffffffff);
+                               page_cache_release(vmpage);
                        }
-                       spin_unlock(&hdr->coh_page_guard);
 
                        lu_object_ref_del(&clob->co_lu, "dump", current);
                        cl_object_put(env, clob);
@@ -401,33 +397,33 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
 } while(0)
 
 static void vvp_pgcache_page_show(const struct lu_env *env,
-                                  struct seq_file *seq, struct cl_page *page)
+                                 struct seq_file *seq, struct cl_page *page)
 {
        struct ccc_page *cpg;
        struct page      *vmpage;
        int              has_flags;
 
-        cpg = cl2ccc_page(cl_page_at(page, &vvp_device_type));
-        vmpage = cpg->cpg_page;
-        seq_printf(seq," %5i | %p %p %s %s %s %s | %p %lu/%u(%p) %lu %u [",
-                   0 /* gen */,
-                   cpg, page,
-                   "none",
-                   cpg->cpg_write_queued ? "wq" : "- ",
-                   cpg->cpg_defer_uptodate ? "du" : "- ",
-                   PageWriteback(vmpage) ? "wb" : "-",
-                   vmpage, vmpage->mapping->host->i_ino,
-                   vmpage->mapping->host->i_generation,
-                   vmpage->mapping->host, vmpage->index,
-                   page_count(vmpage));
-        has_flags = 0;
-        seq_page_flag(seq, vmpage, locked, has_flags);
-        seq_page_flag(seq, vmpage, error, has_flags);
-        seq_page_flag(seq, vmpage, referenced, has_flags);
-        seq_page_flag(seq, vmpage, uptodate, has_flags);
-        seq_page_flag(seq, vmpage, dirty, has_flags);
-        seq_page_flag(seq, vmpage, writeback, has_flags);
-        seq_printf(seq, "%s]\n", has_flags ? "" : "-");
+       cpg = cl2ccc_page(cl_page_at(page, &vvp_device_type));
+       vmpage = cpg->cpg_page;
+       seq_printf(seq, " %5i | %p %p %s %s %s %s | %p "DFID"(%p) %lu %u [",
+                  0 /* gen */,
+                  cpg, page,
+                  "none",
+                  cpg->cpg_write_queued ? "wq" : "- ",
+                  cpg->cpg_defer_uptodate ? "du" : "- ",
+                  PageWriteback(vmpage) ? "wb" : "-",
+                  vmpage,
+                  PFID(ll_inode2fid(vmpage->mapping->host)),
+                  vmpage->mapping->host, vmpage->index,
+                  page_count(vmpage));
+       has_flags = 0;
+       seq_page_flag(seq, vmpage, locked, has_flags);
+       seq_page_flag(seq, vmpage, error, has_flags);
+       seq_page_flag(seq, vmpage, referenced, has_flags);
+       seq_page_flag(seq, vmpage, uptodate, has_flags);
+       seq_page_flag(seq, vmpage, dirty, has_flags);
+       seq_page_flag(seq, vmpage, writeback, has_flags);
+       seq_printf(seq, "%s]\n", has_flags ? "" : "-");
 }
 
 static int vvp_pgcache_show(struct seq_file *f, void *v)
@@ -436,8 +432,6 @@ static int vvp_pgcache_show(struct seq_file *f, void *v)
        struct ll_sb_info       *sbi;
        struct cl_object        *clob;
        struct lu_env           *env;
-       struct cl_page          *page;
-       struct cl_object_header *hdr;
        struct vvp_pgcache_id    id;
        int                      refcheck;
        int                      result;
@@ -449,19 +443,27 @@ static int vvp_pgcache_show(struct seq_file *f, void *v)
                sbi = f->private;
                clob = vvp_pgcache_obj(env, &sbi->ll_cl->cd_lu_dev, &id);
                if (clob != NULL) {
-                       hdr = cl_object_header(clob);
-
-                       spin_lock(&hdr->coh_page_guard);
-                       page = cl_page_lookup(hdr, id.vpi_index);
+                       struct inode *inode = ccc_object_inode(clob);
+                       struct cl_page *page = NULL;
+                       struct page *vmpage;
+
+                       result = find_get_pages_contig(inode->i_mapping,
+                                                     id.vpi_index, 1, &vmpage);
+                       if (result > 0) {
+                               lock_page(vmpage);
+                               page = cl_vmpage_page(vmpage, clob);
+                               unlock_page(vmpage);
+
+                               page_cache_release(vmpage);
+                       }
 
-                       seq_printf(f, "%8x@"DFID": ",
-                                  id.vpi_index, PFID(&hdr->coh_lu.loh_fid));
+                       seq_printf(f, "%8x@"DFID": ", id.vpi_index,
+                                  PFID(lu_object_fid(&clob->co_lu)));
                        if (page != NULL) {
                                vvp_pgcache_page_show(env, f, page);
                                cl_page_put(env, page);
                        } else
                                seq_puts(f, "missing\n");
-                       spin_unlock(&hdr->coh_page_guard);
                        lu_object_ref_del(&clob->co_lu, "dump", current);
                        cl_object_put(env, clob);
                } else
@@ -528,17 +530,16 @@ static struct seq_operations vvp_pgcache_ops = {
 
 static int vvp_dump_pgcache_seq_open(struct inode *inode, struct file *filp)
 {
-        struct proc_dir_entry *dp  = PDE(inode);
-        struct ll_sb_info     *sbi = dp->data;
-        struct seq_file       *seq;
-        int                    result;
-
-        result = seq_open(filp, &vvp_pgcache_ops);
-        if (result == 0) {
-                seq = filp->private_data;
-                seq->private = sbi;
-        }
-        return result;
+       struct ll_sb_info       *sbi = PDE_DATA(inode);
+       struct seq_file         *seq;
+       int                     result;
+
+       result = seq_open(filp, &vvp_pgcache_ops);
+       if (result == 0) {
+               seq = filp->private_data;
+               seq->private = sbi;
+       }
+       return result;
 }
 
 struct file_operations vvp_dump_pgcache_file_ops = {