mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-07 17:44:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: remove ldebugfs_obd_seq_create() wrapper function

Browse Source 
It was just calling debugfs_create_file() so unwind things and just call
the real function instead.  This ends up saving a number of lines as
there was never any error handling happening anyway, so that all can be
removed as well.

Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: James Simmons <jsimmons@infradead.org>
Cc: Quentin Bouget <quentin.bouget@cea.fr>
Cc: Ben Evans <bevans@cray.com>
Cc: NeilBrown <neilb@suse.com>
Cc: Arushi Singhal <arushisinghal19971997@gmail.com>
Cc: Arvind Yadav <arvind.yadav.cs@gmail.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Dafna Hirschfeld <dafna3@gmail.com>
Cc: Mathias Rav <mathiasrav@gmail.com>
Cc: "Gustavo A. R. Silva" <garsilva@embeddedor.com>
Cc: Roman Storozhenko <romeusmeister@gmail.com>
Cc: lustre-devel@lists.lustre.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2018-05-29 16:29:43 +02:00
parent 6f7ed76048
commit 08bd45fd60
5 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/lustre/lustre/include/lprocfs_status.h
View File

@@ -465,12 +465,6 @@ int lprocfs_obd_setup(struct obd_device *obd, struct lprocfs_vars *list,
const struct attribute_group *attrs);
int lprocfs_obd_cleanup(struct obd_device *obd);
int ldebugfs_obd_seq_create(struct obd_device *dev,
const char *name,
umode_t mode,
const struct file_operations *seq_fops,
void *data);
/* Generic callbacks */
int lprocfs_rd_uint(struct seq_file *m, void *data);

11
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
View File

@@ -1538,17 +1538,6 @@ char *lprocfs_find_named_value(const char *buffer, const char *name,
}
EXPORT_SYMBOL(lprocfs_find_named_value);
int ldebugfs_obd_seq_create(struct obd_device *dev,
const char *name,
umode_t mode,
const struct file_operations *seq_fops,
void *data)
{
debugfs_create_file(name, mode, dev->obd_debugfs_entry, data, seq_fops);
return 0;
}
EXPORT_SYMBOL_GPL(ldebugfs_obd_seq_create);
void lprocfs_oh_tally(struct obd_histogram *oh, unsigned int value)
{
if (value >= OBD_HIST_MAX)

10
drivers/staging/lustre/lustre/osc/lproc_osc.c
View File

@@ -801,16 +801,12 @@ static ssize_t osc_stats_seq_write(struct file *file,
LPROC_SEQ_FOPS(osc_stats);
int lproc_osc_attach_seqstat(struct obd_device *dev)
void lproc_osc_attach_seqstat(struct obd_device *dev)
{
int rc;
debugfs_create_file("osc_stats", 0644, dev->obd_debugfs_entry, dev,
&osc_stats_fops);
rc = ldebugfs_obd_seq_create(dev, "rpc_stats", 0644,
&osc_rpc_stats_fops, dev);
return rc;
debugfs_create_file("rpc_stats", 0644, dev->obd_debugfs_entry, dev,
&osc_rpc_stats_fops);
}
static struct attribute *osc_attrs[] = {

2
drivers/staging/lustre/lustre/osc/osc_internal.h
View File

@@ -141,7 +141,7 @@ unsigned long osc_ldlm_weigh_ast(struct ldlm_lock *dlmlock);
int osc_setup(struct obd_device *obd, struct lustre_cfg *lcfg);
int lproc_osc_attach_seqstat(struct obd_device *dev);
void lproc_osc_attach_seqstat(struct obd_device *dev);
void lprocfs_osc_init_vars(struct lprocfs_static_vars *lvars);
extern struct lu_device_type osc_device_type;

21
drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c
View File

@@ -133,8 +133,6 @@ LPROC_SEQ_FOPS_RO(sptlrpc_ctxs_lprocfs);
int sptlrpc_lprocfs_cliobd_attach(struct obd_device *dev)
{
int rc;
if (strcmp(dev->obd_type->typ_name, LUSTRE_OSC_NAME) != 0 &&
strcmp(dev->obd_type->typ_name, LUSTRE_MDC_NAME) != 0 &&
strcmp(dev->obd_type->typ_name, LUSTRE_MGC_NAME) != 0) {
@@ -143,21 +141,10 @@ int sptlrpc_lprocfs_cliobd_attach(struct obd_device *dev)
return -EINVAL;
}
rc = ldebugfs_obd_seq_create(dev, "srpc_info", 0444,
&sptlrpc_info_lprocfs_fops, dev);
if (rc) {
CERROR("create proc entry srpc_info for %s: %d\n",
dev->obd_name, rc);
return rc;
}
rc = ldebugfs_obd_seq_create(dev, "srpc_contexts", 0444,
&sptlrpc_ctxs_lprocfs_fops, dev);
if (rc) {
CERROR("create proc entry srpc_contexts for %s: %d\n",
dev->obd_name, rc);
return rc;
}
debugfs_create_file("srpc_info", 0444, dev->obd_debugfs_entry, dev,
&sptlrpc_info_lprocfs_fops);
debugfs_create_file("srpc_contexts", 0444, dev->obd_debugfs_entry, dev,
&sptlrpc_ctxs_lprocfs_fops);
return 0;
}