X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffld%2Flproc_fld.c;h=24e336c380acd1a91b53365d4aec796ec6283b68;hb=a68e117a54af82f209aed46a822f8346a3e0703f;hp=1629e86ce780e6498ce7e508cd0ca2c55612f925;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git diff --git a/lustre/fld/lproc_fld.c b/lustre/fld/lproc_fld.c index 1629e86..24e336c 100644 --- a/lustre/fld/lproc_fld.c +++ b/lustre/fld/lproc_fld.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2013, Intel Corporation. + * Copyright (c) 2012, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,88 +43,73 @@ #define DEBUG_SUBSYSTEM S_FLD -#ifdef __KERNEL__ -# include -# include -#else /* __KERNEL__ */ -# include -#endif - -#include -#include +#include +#include #include -#include #include -#include #include #include #include "fld_internal.h" -#ifdef LPROCFS +#ifdef CONFIG_PROC_FS 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_fld_hash *hash = NULL; - int i; - ENTRY; + struct lu_client_fld *fld; + struct lu_fld_hash *hash = NULL; + char fh_name[8]; + int i; - LASSERT(fld != NULL); + if (count > sizeof(fh_name)) + return -ENAMETOOLONG; - for (i = 0; fld_hash[i].fh_name != NULL; i++) { - if (count != strlen(fld_hash[i].fh_name)) - continue; + if (copy_from_user(fh_name, buffer, count) != 0) + return -EFAULT; - if (!strncmp(fld_hash[i].fh_name, buffer, count)) { - hash = &fld_hash[i]; - break; - } - } + fld = ((struct seq_file *)file->private_data)->private; + LASSERT(fld != NULL); + + for (i = 0; fld_hash[i].fh_name != NULL; i++) { + if (count != strlen(fld_hash[i].fh_name)) + continue; + + if (!strncmp(fld_hash[i].fh_name, fh_name, count)) { + hash = &fld_hash[i]; + break; + } + } if (hash != NULL) { spin_lock(&fld->lcf_lock); @@ -135,14 +120,14 @@ fld_proc_write_hash(struct file *file, const char *buffer, fld->lcf_name, hash->fh_name); } - RETURN(count); + 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); @@ -154,11 +139,26 @@ 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_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; struct lu_server_fld *fsp_fld; - int fsp_stop:1; + unsigned int fsp_stop:1; }; static void *fldb_seq_start(struct seq_file *p, loff_t *pos) @@ -167,6 +167,8 @@ static void *fldb_seq_start(struct seq_file *p, loff_t *pos) 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; @@ -176,9 +178,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; } @@ -189,13 +198,15 @@ static void fldb_seq_stop(struct seq_file *p, void *v) struct lu_server_fld *fld; struct dt_object *obj; + if (param == NULL) + return; + fld = param->fsp_fld; obj = fld->lsf_obj; LASSERT(obj != NULL); iops = &obj->do_index_ops->dio_it; iops->put(¶m->fsp_env, param->fsp_it); - return; } static void *fldb_seq_next(struct seq_file *p, void *v, loff_t *pos) @@ -252,7 +263,7 @@ static int fldb_seq_show(struct seq_file *p, void *v) fld->lsf_name, rc); } else if (fld_rec->lsr_start != 0) { range_be_to_cpu(fld_rec, fld_rec); - rc = seq_printf(p, DRANGE"\n", PRANGE(fld_rec)); + seq_printf(p, DRANGE"\n", PRANGE(fld_rec)); } return rc; @@ -267,16 +278,18 @@ 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); + rc = LPROCFS_ENTRY_CHECK(inode); + if (rc < 0) + return rc; + rc = seq_open(file, &fldb_sops); if (rc) GOTO(out, rc); @@ -298,7 +311,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(¶m->fsp_env, obj, 0, NULL); + param->fsp_it = iops->init(¶m->fsp_env, obj, 0); if (IS_ERR(param->fsp_it)) GOTO(out, rc = PTR_ERR(param->fsp_it)); @@ -313,7 +326,6 @@ out: lu_env_fini(¶m->fsp_env); if (param != NULL) OBD_FREE_PTR(param); - LPROCFS_EXIT(); } return rc; } @@ -338,7 +350,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); @@ -348,20 +359,17 @@ static int fldb_seq_release(struct inode *inode, struct file *file) return 0; } -struct lprocfs_vars fld_server_proc_list[] = { - { NULL }}; - -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 }}; - -struct file_operations fld_proc_seq_fops = { +const struct file_operations fld_proc_seq_fops = { .owner = THIS_MODULE, .open = fldb_seq_open, .read = seq_read, .release = fldb_seq_release, }; -#endif +struct lprocfs_vars fld_server_proc_list[] = { + { NULL } +}; + +# endif /* HAVE_SERVER_SUPPORT */ + +#endif /* CONFIG_PROC_FS */