X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ffld%2Flproc_fld.c;h=b231c16dfe92d99c5623c451436f105b2332da08;hb=473bc6473eb8d6d78069a561dbe035e795d8b7e2;hp=b4e45fde7aaab68d774a43a46c3980679fa48bfa;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;p=fs%2Flustre-release.git

diff --git a/lustre/fld/lproc_fld.c b/lustre/fld/lproc_fld.c
index b4e45fd..b231c16 100644
--- a/lustre/fld/lproc_fld.c
+++ b/lustre/fld/lproc_fld.c
@@ -51,7 +51,7 @@
 #include <lustre_fid.h>
 #include "fld_internal.h"
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 static int
 fld_proc_targets_seq_show(struct seq_file *m, void *unused)
 {
@@ -136,7 +136,7 @@ LPROC_SEQ_FOPS_RO(fld_proc_targets);
 LPROC_SEQ_FOPS(fld_proc_hash);
 LPROC_SEQ_FOPS_WO_TYPE(fld, cache_flush);
 
-struct lprocfs_seq_vars fld_client_proc_list[] = {
+struct lprocfs_vars fld_client_proc_list[] = {
 	{ .name	=	"targets",
 	  .fops	=	&fld_proc_targets_fops	},
 	{ .name	=	"hash",
@@ -279,7 +279,10 @@ static int fldb_seq_open(struct inode *inode, struct file *file)
 	int			env_init = 0;
 	int			rc;
 
-	LPROCFS_ENTRY_CHECK(PDE(inode));
+	rc = LPROCFS_ENTRY_CHECK(inode);
+	if (rc < 0)
+		return rc;
+
 	rc = seq_open(file, &fldb_sops);
 	if (rc)
 		GOTO(out, rc);
@@ -301,7 +304,7 @@ static int fldb_seq_open(struct inode *inode, struct file *file)
 
 	env_init = 1;
 	iops = &obj->do_index_ops->dio_it;
-	param->fsp_it = iops->init(&param->fsp_env, obj, 0, NULL);
+	param->fsp_it = iops->init(&param->fsp_env, obj, 0);
 	if (IS_ERR(param->fsp_it))
 		GOTO(out, rc = PTR_ERR(param->fsp_it));
 
@@ -356,10 +359,10 @@ const struct file_operations fld_proc_seq_fops = {
 	.release = fldb_seq_release,
 };
 
-struct lprocfs_seq_vars fld_server_proc_list[] = {
+struct lprocfs_vars fld_server_proc_list[] = {
 	{ NULL }
 };
 
 # endif /* HAVE_SERVER_SUPPORT */
 
-#endif /* LPROCFS */
+#endif /* CONFIG_PROC_FS */