Skip to contentSkip to conversation

scsi: snic: debugfs: remove local storage of debugfs files

PATCH In review Greg Kroah-Hartman 2 participants 4 messages May 18, 2021 – May 21, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: snic: debugfs: remove local storage of debugfs files

There is no need to keep the dentry around for the debugfs trace files, as we can just look it up when we want to remove it later on. Simplify the structure by removing the dentries and relying on debugfs to find the dentry to remove when we want to.

By doing this change, we remove the last in-kernel user that was storing the result of debugfs_create_bool(), so that api can be cleaned up.

Cc Karan Tilak Kumar <[email protected]>
Cc Sesidhar Baddela <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc "Martin K. Petersen" <[email protected]>
---
 drivers/scsi/snic/snic_debugfs.c | 23 +++++++++--------------
 drivers/scsi/snic/snic_trc.h     |  3 ---
 2 files changed, 9 insertions(+), 17 deletions(-)
drivers/scsi/snic/snic_debugfs.c +9 -14
index 3aeee856d5c7..5e0faeba516e 100644
@@ -430,21 +430,19 @@ static const struct seq_operations snic_trc_sops = {
 
 DEFINE_SEQ_ATTRIBUTE(snic_trc);
 
+#define TRC_ENABLE_FILE	"tracing_enable"
+#define TRC_FILE	"trace"
 /*
  * snic_trc_debugfs_init : creates trace/tracing_enable files for trace
  * under debugfs
  */
 void snic_trc_debugfs_init(void)
 {
-	snic_glob->trc.trc_enable = debugfs_create_bool("tracing_enable",
-							S_IFREG | S_IRUGO | S_IWUSR,
-							snic_glob->trc_root,
-							&snic_glob->trc.enable);
-
-	snic_glob->trc.trc_file = debugfs_create_file("trace",
-						      S_IFREG | S_IRUGO | S_IWUSR,
-						      snic_glob->trc_root, NULL,
-						      &snic_trc_fops);
+	debugfs_create_bool(TRC_ENABLE_FILE, S_IFREG | S_IRUGO | S_IWUSR,
+			    snic_glob->trc_root, &snic_glob->trc.enable);
+
+	debugfs_create_file(TRC_FILE, S_IFREG | S_IRUGO | S_IWUSR,
+			    snic_glob->trc_root, NULL, &snic_trc_fops);
 }
 
 /*
@@ -453,9 +451,6 @@ void snic_trc_debugfs_init(void)
 void
 snic_trc_debugfs_term(void)
 {
-	debugfs_remove(snic_glob->trc.trc_file);
-	snic_glob->trc.trc_file = NULL;
-
-	debugfs_remove(snic_glob->trc.trc_enable);
-	snic_glob->trc.trc_enable = NULL;
+	debugfs_remove(debugfs_lookup(TRC_FILE, snic_glob->trc_root));
+	debugfs_remove(debugfs_lookup(TRC_ENABLE_FILE, snic_glob->trc_root));
 }
drivers/scsi/snic/snic_trc.h +0 -3
index 87dcc7457d15..ce305b4b8fa2 100644
@@ -46,9 +46,6 @@ struct snic_trc {
 	u32	rd_idx;
 	u32	wr_idx;
 	bool	enable;			/* Control Variable for Tracing */
-
-	struct dentry *trc_enable;	/* debugfs file object */
-	struct dentry *trc_file;
 };
 
 int snic_trc_init(void);
Signature · 1 line
2.31.1
#1 lore raw
Quoted 14 lines · Greg Kroah-Hartman

There is no need to keep the dentry around for the debugfs trace files, as we can just look it up when we want to remove it later on. Simplify the structure by removing the dentries and relying on debugfs to find the dentry to remove when we want to.

By doing this change, we remove the last in-kernel user that was storing the result of debugfs_create_bool(), so that api can be cleaned up.

Cc Karan Tilak Kumar <[email protected]>
Cc Sesidhar Baddela <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc "Martin K. Petersen" <[email protected]>
Quoted 4 lines
---
 drivers/scsi/snic/snic_debugfs.c | 23 +++++++++--------------
 drivers/scsi/snic/snic_trc.h     |  3 ---
 2 files changed, 9 insertions(+), 17 deletions(-)

I can take this through my debugfs tree so I can clean up the debugfs_create_bool() api if no one objects.

thanks,

greg k-h

#2 lore raw

Greg,

Quoted 6 lines
Quoted 3 lines
 drivers/scsi/snic/snic_debugfs.c | 23 +++++++++--------------
 drivers/scsi/snic/snic_trc.h     |  3 ---
 2 files changed, 9 insertions(+), 17 deletions(-)

I can take this through my debugfs tree so I can clean up the debugfs_create_bool() api if no one objects.

Sure, not a problem.

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#3 lore raw
Quoted 11 lines · Martin K. Petersen

Greg,

Quoted 6 lines
Quoted 3 lines
 drivers/scsi/snic/snic_debugfs.c | 23 +++++++++--------------
 drivers/scsi/snic/snic_trc.h     |  3 ---
 2 files changed, 9 insertions(+), 17 deletions(-)

I can take this through my debugfs tree so I can clean up the debugfs_create_bool() api if no one objects.

Sure, not a problem.

Thanks!