* [PATCH] ntb: Add error path/handling to Debug FS entry creation
@ 2017-05-15 15:33 Gary R Hook
2017-05-15 16:34 ` Dave Jiang
0 siblings, 1 reply; 2+ messages in thread
From: Gary R Hook @ 2017-05-15 15:33 UTC (permalink / raw)
To: linux-ntb; +Cc: Allen.Hubbe, dave.jiang, jdmason
If a failure occurs when creating Debug FS entries, unroll all of
the work that's been done.
Signed-off-by: Gary R Hook <gary.hook@amd.com>
---
drivers/ntb/test/ntb_perf.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
index 6fdddf86269e..759f772fa00c 100644
--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
@@ -745,6 +745,7 @@ static int perf_debugfs_setup(struct perf_ctx *perf)
if (!debugfs_initialized())
return -ENODEV;
+ /* Assumpion: only one NTB device in the system */
if (!perf_debugfs_dir) {
perf_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
if (!perf_debugfs_dir)
@@ -754,45 +755,50 @@ static int perf_debugfs_setup(struct perf_ctx *perf)
debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
perf_debugfs_dir);
if (!debugfs_node_dir)
- return -ENODEV;
+ goto err;
debugfs_run = debugfs_create_file("run", S_IRUSR | S_IWUSR,
debugfs_node_dir, perf,
&ntb_perf_debugfs_run);
if (!debugfs_run)
- return -ENODEV;
+ goto err;
debugfs_threads = debugfs_create_u8("threads", S_IRUSR | S_IWUSR,
debugfs_node_dir,
&perf->perf_threads);
if (!debugfs_threads)
- return -ENODEV;
+ goto err;
debugfs_seg_order = debugfs_create_u32("seg_order", 0600,
debugfs_node_dir,
&seg_order);
if (!debugfs_seg_order)
- return -ENODEV;
+ goto err;
debugfs_run_order = debugfs_create_u32("run_order", 0600,
debugfs_node_dir,
&run_order);
if (!debugfs_run_order)
- return -ENODEV;
+ goto err;
debugfs_use_dma = debugfs_create_bool("use_dma", 0600,
debugfs_node_dir,
&use_dma);
if (!debugfs_use_dma)
- return -ENODEV;
+ goto err;
debugfs_on_node = debugfs_create_bool("on_node", 0600,
debugfs_node_dir,
&on_node);
if (!debugfs_on_node)
- return -ENODEV;
+ goto err;
return 0;
+
+err:
+ debugfs_remove_recursive(perf_debugfs_dir);
+ perf_debugfs_dir = NULL;
+ return -ENODEV;
}
static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] ntb: Add error path/handling to Debug FS entry creation
2017-05-15 15:33 [PATCH] ntb: Add error path/handling to Debug FS entry creation Gary R Hook
@ 2017-05-15 16:34 ` Dave Jiang
0 siblings, 0 replies; 2+ messages in thread
From: Dave Jiang @ 2017-05-15 16:34 UTC (permalink / raw)
To: Gary R Hook, linux-ntb; +Cc: Allen.Hubbe, jdmason
On 05/15/2017 08:33 AM, Gary R Hook wrote:
> If a failure occurs when creating Debug FS entries, unroll all of
> the work that's been done.
>
> Signed-off-by: Gary R Hook <gary.hook@amd.com>
Acked-by: Dave Jiang <dave.jiang@intel.com>
> ---
> drivers/ntb/test/ntb_perf.c | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
> index 6fdddf86269e..759f772fa00c 100644
> --- a/drivers/ntb/test/ntb_perf.c
> +++ b/drivers/ntb/test/ntb_perf.c
> @@ -745,6 +745,7 @@ static int perf_debugfs_setup(struct perf_ctx *perf)
> if (!debugfs_initialized())
> return -ENODEV;
>
> + /* Assumpion: only one NTB device in the system */
> if (!perf_debugfs_dir) {
> perf_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> if (!perf_debugfs_dir)
> @@ -754,45 +755,50 @@ static int perf_debugfs_setup(struct perf_ctx *perf)
> debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
> perf_debugfs_dir);
> if (!debugfs_node_dir)
> - return -ENODEV;
> + goto err;
>
> debugfs_run = debugfs_create_file("run", S_IRUSR | S_IWUSR,
> debugfs_node_dir, perf,
> &ntb_perf_debugfs_run);
> if (!debugfs_run)
> - return -ENODEV;
> + goto err;
>
> debugfs_threads = debugfs_create_u8("threads", S_IRUSR | S_IWUSR,
> debugfs_node_dir,
> &perf->perf_threads);
> if (!debugfs_threads)
> - return -ENODEV;
> + goto err;
>
> debugfs_seg_order = debugfs_create_u32("seg_order", 0600,
> debugfs_node_dir,
> &seg_order);
> if (!debugfs_seg_order)
> - return -ENODEV;
> + goto err;
>
> debugfs_run_order = debugfs_create_u32("run_order", 0600,
> debugfs_node_dir,
> &run_order);
> if (!debugfs_run_order)
> - return -ENODEV;
> + goto err;
>
> debugfs_use_dma = debugfs_create_bool("use_dma", 0600,
> debugfs_node_dir,
> &use_dma);
> if (!debugfs_use_dma)
> - return -ENODEV;
> + goto err;
>
> debugfs_on_node = debugfs_create_bool("on_node", 0600,
> debugfs_node_dir,
> &on_node);
> if (!debugfs_on_node)
> - return -ENODEV;
> + goto err;
>
> return 0;
> +
> +err:
> + debugfs_remove_recursive(perf_debugfs_dir);
> + perf_debugfs_dir = NULL;
> + return -ENODEV;
> }
>
> static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-15 16:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-15 15:33 [PATCH] ntb: Add error path/handling to Debug FS entry creation Gary R Hook
2017-05-15 16:34 ` Dave Jiang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox