return result;
}
-static void fld_server_proc_fini(struct lu_server_fld *fld);
+static void fld_server_debugfs_fini(struct lu_server_fld *fld)
+{
+ if (!IS_ERR_OR_NULL(fld->lsf_debugfs_entry))
+ ldebugfs_remove(&fld->lsf_debugfs_entry);
+}
-#ifdef CONFIG_PROC_FS
-static int fld_server_proc_init(struct lu_server_fld *fld)
+static int fld_server_debugfs_init(struct lu_server_fld *fld)
{
- int rc = 0;
- ENTRY;
+ int rc = 0;
- fld->lsf_proc_dir = lprocfs_register(fld->lsf_name, fld_type_proc_dir,
- fld_server_proc_list, fld);
- if (IS_ERR(fld->lsf_proc_dir)) {
- rc = PTR_ERR(fld->lsf_proc_dir);
+ ENTRY;
+ fld->lsf_debugfs_entry = ldebugfs_register(fld->lsf_name,
+ fld_debugfs_dir,
+ NULL, NULL);
+ if (IS_ERR_OR_NULL(fld->lsf_debugfs_entry)) {
+ rc = fld->lsf_debugfs_entry ? PTR_ERR(fld->lsf_debugfs_entry)
+ : -ENOMEM;
+ fld->lsf_debugfs_entry = NULL;
RETURN(rc);
}
- rc = lprocfs_seq_create(fld->lsf_proc_dir, "fldb", 0444,
- &fld_proc_seq_fops, fld);
- if (rc) {
- lprocfs_remove(&fld->lsf_proc_dir);
- fld->lsf_proc_dir = NULL;
- }
+ rc = ldebugfs_seq_create(fld->lsf_debugfs_entry, "fldb", 0444,
+ &fld_debugfs_seq_fops, fld);
+ if (rc)
+ ldebugfs_remove(&fld->lsf_debugfs_entry);
RETURN(rc);
}
-static void fld_server_proc_fini(struct lu_server_fld *fld)
-{
- ENTRY;
- if (fld->lsf_proc_dir != NULL) {
- if (!IS_ERR(fld->lsf_proc_dir))
- lprocfs_remove(&fld->lsf_proc_dir);
- fld->lsf_proc_dir = NULL;
- }
- EXIT;
-}
-#else
-static int fld_server_proc_init(struct lu_server_fld *fld)
-{
- return 0;
-}
-
-static void fld_server_proc_fini(struct lu_server_fld *fld)
-{
- return;
-}
-#endif
-
int fld_server_init(const struct lu_env *env, struct lu_server_fld *fld,
struct dt_device *dt, const char *prefix, int type)
{
if (rc)
GOTO(out_cache, rc);
- rc = fld_server_proc_init(fld);
+ rc = fld_server_debugfs_init(fld);
if (rc)
GOTO(out_index, rc);
{
ENTRY;
- fld_server_proc_fini(fld);
+ fld_server_debugfs_fini(fld);
fld_index_fini(env, fld);
if (fld->lsf_cache != NULL) {
extern struct lu_fld_hash fld_hash[];
-
-#ifdef CONFIG_PROC_FS
-extern struct proc_dir_entry *fld_type_proc_dir;
-extern struct lprocfs_vars fld_client_proc_list[];
-#endif
-
# ifdef HAVE_SERVER_SUPPORT
struct fld_thread_info {
struct lu_seq_range fti_rec;
u64 seq, struct lu_seq_range *range);
int fld_name_to_index(const char *name, __u32 *index);
-int fld_server_mod_init(void);
+int fld_server_mod_init(void);
void fld_server_mod_exit(void);
int fld_server_read(const struct lu_env *env, struct lu_server_fld *fld,
struct lu_seq_range *range, void *data, int data_len);
-#ifdef CONFIG_PROC_FS
-extern const struct file_operations fld_proc_seq_fops;
-extern struct lprocfs_vars fld_server_proc_list[];
-#endif
+
+extern const struct file_operations fld_debugfs_seq_fops;
+extern struct dentry *fld_debugfs_dir;
# endif /* HAVE_SERVER_SUPPORT */
struct lu_seq_range *range, __u32 fld_op,
struct ptlrpc_request **reqp);
+extern struct lprocfs_vars fld_client_debugfs_list[];
+
struct fld_cache *fld_cache_init(const char *name,
int cache_size, int cache_threshold);
RETURN(-ENOENT);
}
-#ifdef CONFIG_PROC_FS
-static int fld_client_proc_init(struct lu_client_fld *fld)
+struct dentry *fld_debugfs_dir;
+
+static int fld_client_debugfs_init(struct lu_client_fld *fld)
{
int rc;
- ENTRY;
- fld->lcf_proc_dir = lprocfs_register(fld->lcf_name, fld_type_proc_dir,
- NULL, NULL);
- if (IS_ERR(fld->lcf_proc_dir)) {
- CERROR("%s: LProcFS failed in fld-init\n",
- fld->lcf_name);
- rc = PTR_ERR(fld->lcf_proc_dir);
+ ENTRY;
+ fld->lcf_debugfs_entry = ldebugfs_register(fld->lcf_name,
+ fld_debugfs_dir,
+ fld_client_debugfs_list,
+ fld);
+ if (IS_ERR_OR_NULL(fld->lcf_debugfs_entry)) {
+ CERROR("%s: LdebugFS failed in fld-init\n", fld->lcf_name);
+ rc = fld->lcf_debugfs_entry ? PTR_ERR(fld->lcf_debugfs_entry)
+ : -ENOMEM;
+ fld->lcf_debugfs_entry = NULL;
RETURN(rc);
}
- rc = lprocfs_add_vars(fld->lcf_proc_dir, fld_client_proc_list, fld);
- if (rc) {
- CERROR("%s: Can't init FLD proc, rc %d\n",
- fld->lcf_name, rc);
- GOTO(out_cleanup, rc);
- }
-
- RETURN(0);
-
-out_cleanup:
- fld_client_proc_fini(fld);
- return rc;
-}
-
-void fld_client_proc_fini(struct lu_client_fld *fld)
-{
- ENTRY;
- if (fld->lcf_proc_dir) {
- if (!IS_ERR(fld->lcf_proc_dir))
- lprocfs_remove(&fld->lcf_proc_dir);
- fld->lcf_proc_dir = NULL;
- }
- EXIT;
-}
-#else /* !CONFIG_PROC_FS */
-static int fld_client_proc_init(struct lu_client_fld *fld)
-{
- return 0;
+ return 0;
}
-void fld_client_proc_fini(struct lu_client_fld *fld)
+void fld_client_debugfs_fini(struct lu_client_fld *fld)
{
- return;
+ if (!IS_ERR_OR_NULL(fld->lcf_debugfs_entry))
+ ldebugfs_remove(&fld->lcf_debugfs_entry);
}
-#endif /* CONFIG_PROC_FS */
-
-EXPORT_SYMBOL(fld_client_proc_fini);
+EXPORT_SYMBOL(fld_client_debugfs_fini);
static inline int hash_is_sane(int hash)
{
int fld_client_init(struct lu_client_fld *fld,
const char *prefix, int hash)
{
- int cache_size, cache_threshold;
- int rc;
- ENTRY;
-
- LASSERT(fld != NULL);
+ int cache_size, cache_threshold;
+ int rc;
- snprintf(fld->lcf_name, sizeof(fld->lcf_name),
- "cli-%s", prefix);
+ ENTRY;
+ snprintf(fld->lcf_name, sizeof(fld->lcf_name),
+ "cli-%s", prefix);
if (!hash_is_sane(hash)) {
CERROR("%s: Wrong hash function %#x\n",
GOTO(out, rc);
}
- rc = fld_client_proc_init(fld);
+ rc = fld_client_debugfs_init(fld);
if (rc)
GOTO(out, rc);
EXIT;
fld_cache_flush(fld->lcf_cache);
}
-
-struct proc_dir_entry *fld_type_proc_dir;
-
static int __init fld_init(void)
{
- fld_type_proc_dir = lprocfs_register(LUSTRE_FLD_NAME,
- proc_lustre_root,
- NULL, NULL);
- if (IS_ERR(fld_type_proc_dir))
- return PTR_ERR(fld_type_proc_dir);
-
#ifdef HAVE_SERVER_SUPPORT
- fld_server_mod_init();
+ int rc;
+
+ rc = fld_server_mod_init();
+ if (rc)
+ return rc;
#endif /* HAVE_SERVER_SUPPORT */
- return 0;
+ fld_debugfs_dir = ldebugfs_register(LUSTRE_FLD_NAME,
+ debugfs_lustre_root,
+ NULL, NULL);
+ return PTR_ERR_OR_ZERO(fld_debugfs_dir);
}
static void __exit fld_exit(void)
fld_server_mod_exit();
#endif /* HAVE_SERVER_SUPPORT */
- if (fld_type_proc_dir != NULL && !IS_ERR(fld_type_proc_dir)) {
- lprocfs_remove(&fld_type_proc_dir);
- fld_type_proc_dir = NULL;
- }
+ if (!IS_ERR_OR_NULL(fld_debugfs_dir))
+ ldebugfs_remove(&fld_debugfs_dir);
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
#include <libcfs/libcfs.h>
#include <linux/module.h>
+
+#ifdef HAVE_SERVER_SUPPORT
#include <dt_object.h>
+#endif
#include <obd_support.h>
#include <lustre_fld.h>
#include <lustre_fid.h>
#include "fld_internal.h"
-#ifdef CONFIG_PROC_FS
static int
-fld_proc_targets_seq_show(struct seq_file *m, void *unused)
+fld_debugfs_targets_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_fld *fld = (struct lu_client_fld *)m->private;
struct lu_fld_target *target;
- ENTRY;
-
- LASSERT(fld != NULL);
+ ENTRY;
spin_lock(&fld->lcf_lock);
list_for_each_entry(target, &fld->lcf_targets, ft_chain)
seq_printf(m, "%s\n", fld_target_name(target));
spin_unlock(&fld->lcf_lock);
+
RETURN(0);
}
static int
-fld_proc_hash_seq_show(struct seq_file *m, void *unused)
+fld_debugfs_hash_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_fld *fld = (struct lu_client_fld *)m->private;
- ENTRY;
-
- LASSERT(fld != NULL);
+ ENTRY;
spin_lock(&fld->lcf_lock);
seq_printf(m, "%s\n", fld->lcf_hash->fh_name);
spin_unlock(&fld->lcf_lock);
}
static ssize_t
-fld_proc_hash_seq_write(struct file *file, const char __user *buffer,
+fld_debugfs_hash_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct lu_client_fld *fld;
return -EFAULT;
fld = ((struct seq_file *)file->private_data)->private;
- LASSERT(fld != NULL);
- for (i = 0; fld_hash[i].fh_name != NULL; i++) {
+ for (i = 0; fld_hash[i].fh_name; i++) {
if (count != strlen(fld_hash[i].fh_name))
continue;
}
}
- if (hash != NULL) {
+ if (hash) {
spin_lock(&fld->lcf_lock);
fld->lcf_hash = hash;
spin_unlock(&fld->lcf_lock);
return count;
}
-static ssize_t
-lprocfs_cache_flush_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *pos)
+static ssize_t ldebugfs_cache_flush_seq_write(struct file *file,
+ const char __user *buffer,
+ size_t count, loff_t *pos)
{
- struct lu_client_fld *fld = ((struct seq_file *)file->private_data)->private;
- ENTRY;
-
- LASSERT(fld != NULL);
+ struct seq_file *m = file->private_data;
+ struct lu_client_fld *fld = m->private;
+ ENTRY;
fld_cache_flush(fld->lcf_cache);
CDEBUG(D_INFO, "%s: Lookup cache is flushed\n", fld->lcf_name);
RETURN(count);
}
-LPROC_SEQ_FOPS_RO(fld_proc_targets);
-LPROC_SEQ_FOPS(fld_proc_hash);
-LPROC_SEQ_FOPS_WR_ONLY(fld, cache_flush);
+LDEBUGFS_SEQ_FOPS_RO(fld_debugfs_targets);
+LDEBUGFS_SEQ_FOPS(fld_debugfs_hash);
+LDEBUGFS_FOPS_WR_ONLY(fld, cache_flush);
-struct lprocfs_vars fld_client_proc_list[] = {
+struct lprocfs_vars fld_client_debugfs_list[] = {
{ .name = "targets",
- .fops = &fld_proc_targets_fops },
+ .fops = &fld_debugfs_targets_fops },
{ .name = "hash",
- .fops = &fld_proc_hash_fops },
+ .fops = &fld_debugfs_hash_fops },
{ .name = "cache_flush",
.fops = &fld_cache_flush_fops },
{ NULL }
static int fldb_seq_open(struct inode *inode, struct file *file)
{
struct seq_file *seq;
- struct lu_server_fld *fld = (struct lu_server_fld *)PDE_DATA(inode);
+ struct lu_server_fld *fld = inode->i_private;
struct dt_object *obj;
const struct dt_it_ops *iops;
struct fld_seq_param *param = NULL;
int env_init = 0;
int rc;
- rc = LPROCFS_ENTRY_CHECK(inode);
- if (rc < 0)
- return rc;
-
rc = seq_open(file, &fldb_sops);
if (rc)
GOTO(out, rc);
return 0;
}
-const struct file_operations fld_proc_seq_fops = {
+const struct file_operations fld_debugfs_seq_fops = {
.owner = THIS_MODULE,
.open = fldb_seq_open,
.read = seq_read,
.release = fldb_seq_release,
};
-struct lprocfs_vars fld_server_proc_list[] = {
- { NULL }
-};
-
# endif /* HAVE_SERVER_SUPPORT */
-
-#endif /* CONFIG_PROC_FS */
};
struct lu_server_fld {
- /**
- * Fld dir proc entry. */
- struct proc_dir_entry *lsf_proc_dir;
+ /**
+ * Fld dir debugfs entry.
+ */
+ struct dentry *lsf_debugfs_entry;
/**
* /fld file object device */
struct lu_client_fld {
/**
- * Client side proc entry. */
- struct proc_dir_entry *lcf_proc_dir;
+ * Client side debugfs entry.
+ */
+ struct dentry *lcf_debugfs_entry;
/**
* List of exports client FLD knows about. */
struct fld_cache *lcf_cache;
/**
- * Client fld proc entry name. */
+ * Client fld debugfs entry name.
+ */
char lcf_name[80];
};
int fld_client_del_target(struct lu_client_fld *fld,
__u64 idx);
-void fld_client_proc_fini(struct lu_client_fld *fld);
+void fld_client_debugfs_fini(struct lu_client_fld *fld);
/** @} fld */
{
ENTRY;
libcfs_kkuc_group_rem(&obd->obd_uuid, 0, KUC_GRP_HSM);
- fld_client_proc_fini(&obd->u.lmv.lmv_fld);
+ fld_client_debugfs_fini(&obd->u.lmv.lmv_fld);
lprocfs_obd_cleanup(obd);
lprocfs_free_md_stats(obd);
RETURN(0);
git://git.whamcloud.com / fs / lustre-release.git / commitdiff