X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffld%2Flproc_fld.c;h=8dd6fe4e51fe46d3fb8ad73b53469ff7150af607;hb=73c12f4d6c98476c0dc5de77a646a157db727eef;hp=1a3e58e16c55abd3c154fe4c027916ea0d43166a;hpb=919b358468e13a0ba8719bd4a4c135e11017dd8b;p=fs%2Flustre-release.git diff --git a/lustre/fld/lproc_fld.c b/lustre/fld/lproc_fld.c index 1a3e58e..8dd6fe4 100644 --- a/lustre/fld/lproc_fld.c +++ b/lustre/fld/lproc_fld.c @@ -43,13 +43,8 @@ #define DEBUG_SUBSYSTEM S_FLD -#ifdef __KERNEL__ -# include -# include -#else /* __KERNEL__ */ -# include -#endif - +#include +#include #include #include #include @@ -59,54 +54,41 @@ #ifdef LPROCFS static int -fld_proc_read_targets(char *page, char **start, off_t off, - int count, int *eof, void *data) +fld_proc_targets_seq_show(struct seq_file *m, void *unused) { - struct lu_client_fld *fld = (struct lu_client_fld *)data; + struct lu_client_fld *fld = (struct lu_client_fld *)m->private; struct lu_fld_target *target; - int total = 0, rc; ENTRY; LASSERT(fld != NULL); spin_lock(&fld->lcf_lock); - cfs_list_for_each_entry(target, - &fld->lcf_targets, ft_chain) - { - rc = snprintf(page, count, "%s\n", - fld_target_name(target)); - page += rc; - count -= rc; - total += rc; - if (count == 0) - break; - } + 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(total); + RETURN(0); } static int -fld_proc_read_hash(char *page, char **start, off_t off, - int count, int *eof, void *data) +fld_proc_hash_seq_show(struct seq_file *m, void *unused) { - struct lu_client_fld *fld = (struct lu_client_fld *)data; - int rc; + struct lu_client_fld *fld = (struct lu_client_fld *)m->private; ENTRY; LASSERT(fld != NULL); spin_lock(&fld->lcf_lock); - rc = snprintf(page, count, "%s\n", fld->lcf_hash->fh_name); + seq_printf(m, "%s\n", fld->lcf_hash->fh_name); spin_unlock(&fld->lcf_lock); - RETURN(rc); + RETURN(0); } -static int -fld_proc_write_hash(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +fld_proc_hash_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct lu_client_fld *fld = (struct lu_client_fld *)data; + struct lu_client_fld *fld = ((struct seq_file *)file->private_data)->private; struct lu_fld_hash *hash = NULL; int i; ENTRY; @@ -135,11 +117,11 @@ fld_proc_write_hash(struct file *file, const char *buffer, RETURN(count); } -static int -fld_proc_write_cache_flush(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +lprocfs_cache_flush_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *pos) { - struct lu_client_fld *fld = (struct lu_client_fld *)data; + struct lu_client_fld *fld = ((struct seq_file *)file->private_data)->private; ENTRY; LASSERT(fld != NULL); @@ -151,6 +133,21 @@ fld_proc_write_cache_flush(struct file *file, const char *buffer, RETURN(count); } +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[] = { + { .name = "targets", + .fops = &fld_proc_targets_fops }, + { .name = "hash", + .fops = &fld_proc_hash_fops }, + { .name = "cache_flush", + .fops = &fld_cache_flush_fops }, + { NULL } +}; + +#ifdef HAVE_SERVER_SUPPORT struct fld_seq_param { struct lu_env fsp_env; struct dt_it *fsp_it; @@ -158,20 +155,14 @@ struct fld_seq_param { unsigned int fsp_stop:1; }; -struct lprocfs_vars fld_client_proc_list[] = { - { "targets", fld_proc_read_targets, NULL, NULL }, - { "hash", fld_proc_read_hash, fld_proc_write_hash, NULL }, - { "cache_flush", NULL, fld_proc_write_cache_flush, NULL }, - { NULL } -}; - -# ifdef HAVE_SERVER_SUPPORT static void *fldb_seq_start(struct seq_file *p, loff_t *pos) { struct fld_seq_param *param = p->private; struct lu_server_fld *fld; struct dt_object *obj; const struct dt_it_ops *iops; + struct dt_key *key; + int rc; if (param == NULL || param->fsp_stop) return NULL; @@ -181,9 +172,16 @@ static void *fldb_seq_start(struct seq_file *p, loff_t *pos) LASSERT(obj != NULL); iops = &obj->do_index_ops->dio_it; - iops->load(¶m->fsp_env, param->fsp_it, *pos); + rc = iops->load(¶m->fsp_env, param->fsp_it, *pos); + if (rc <= 0) + return NULL; + + key = iops->key(¶m->fsp_env, param->fsp_it); + if (IS_ERR(key)) + return NULL; + + *pos = be64_to_cpu(*(__u64 *)key); - *pos = be64_to_cpu(*(__u64 *)iops->key(¶m->fsp_env, param->fsp_it)); return param; } @@ -274,16 +272,15 @@ struct seq_operations fldb_sops = { static int fldb_seq_open(struct inode *inode, struct file *file) { - struct proc_dir_entry *dp = PDE(inode); struct seq_file *seq; - struct lu_server_fld *fld = (struct lu_server_fld *)dp->data; + struct lu_server_fld *fld = (struct lu_server_fld *)PDE_DATA(inode); struct dt_object *obj; const struct dt_it_ops *iops; struct fld_seq_param *param = NULL; int env_init = 0; int rc; - LPROCFS_ENTRY_AND_CHECK(dp); + LPROCFS_ENTRY_CHECK(PDE(inode)); rc = seq_open(file, &fldb_sops); if (rc) GOTO(out, rc); @@ -320,7 +317,6 @@ out: lu_env_fini(¶m->fsp_env); if (param != NULL) OBD_FREE_PTR(param); - LPROCFS_EXIT(); } return rc; } @@ -345,7 +341,6 @@ static int fldb_seq_release(struct inode *inode, struct file *file) iops = &obj->do_index_ops->dio_it; LASSERT(iops != NULL); - LASSERT(obj != NULL); LASSERT(param->fsp_it != NULL); iops->fini(¶m->fsp_env, param->fsp_it); lu_env_fini(¶m->fsp_env); @@ -362,7 +357,7 @@ const struct file_operations fld_proc_seq_fops = { .release = fldb_seq_release, }; -struct lprocfs_vars fld_server_proc_list[] = { +struct lprocfs_seq_vars fld_server_proc_list[] = { { NULL } };