LU-3319 procfs: move top level proc handling over to seq_file

[fs/lustre-release.git] / lustre / liblustre / dir.c

diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index a13c950..c7560e8 100644 (file)
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -80,9 +80,13 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
         rc = md_lock_match(sbi->ll_md_exp, LDLM_FL_BLOCK_GRANTED,
                            &lli->lli_fid, LDLM_IBITS, &policy, LCK_CR, &lockh);
         if (!rc) {
-                struct ldlm_enqueue_info einfo = {LDLM_IBITS, LCK_CR,
-                        llu_md_blocking_ast, ldlm_completion_ast, NULL, NULL,
-                        inode};
+               struct ldlm_enqueue_info einfo = {
+                       .ei_type        = LDLM_IBITS,
+                       .ei_mode        = LCK_CR,
+                       .ei_cb_bl       = llu_md_blocking_ast,
+                       .ei_cb_cp       = ldlm_completion_ast,
+                       .ei_cbdata      = inode,
+               };
 
                 rc = md_enqueue(sbi->ll_md_exp, &einfo, &it,
                                 &op_data, &lockh, NULL, 0, NULL,
@@ -116,10 +120,10 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
         return rc;
 }
 
-static cfs_page_t *llu_dir_read_page(struct inode *ino, __u64 hash,
+static struct page *llu_dir_read_page(struct inode *ino, __u64 hash,
                                      int exact, struct ll_dir_chain *chain)
 {
-        cfs_page_t *page;
+       struct page *page;
         int rc;
         ENTRY;
 
@@ -189,7 +193,7 @@ ssize_t llu_iop_filldirentries(struct inode *dir, _SYSIO_OFF_T *basep,
         struct intnl_stat     *st = llu_i2stat(dir);
         loff_t                 pos = *basep;
         struct ll_dir_chain    chain;
-        cfs_page_t            *page;
+       struct page            *page;
         int filled = 0;
         int rc;
         int done;