Re: [PATCH 23/28] ppc: Clean up scanlog [RFC]
On 04/16/2013 11:57 PM, David Howells wrote:
Clean up the pseries scanlog driver's use of procfs:
(1) Don't need to save the proc_dir_entry pointer as we have the filename to
remove with.
(2) Save the scan log buffer pointer in a static variable (there is only one
of it) and don't save it in the PDE (which doesn't have a destructor).
Changes looks good.
-Vasant
Signed-off-by: David Howellsdhowe...@redhat.com
cc: Benjamin Herrenschmidtb...@kernel.crashing.org
cc: Paul Mackerraspau...@samba.org
cc: linuxppc-dev@lists.ozlabs.org
---
arch/powerpc/platforms/pseries/scanlog.c | 29 +++--
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/scanlog.c
b/arch/powerpc/platforms/pseries/scanlog.c
index cc220d2..b502ab6 100644
--- a/arch/powerpc/platforms/pseries/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -41,12 +41,12 @@
static unsigned int ibm_scan_log_dump;/* RTAS token */
-static struct proc_dir_entry *proc_ppc64_scan_log_dump;/* The proc
file */
+static unsigned int *scanlog_buffer; /* The data buffer */
static ssize_t scanlog_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
- unsigned int *data = PDE_DATA(file_inode(file));
+ unsigned int *data = scanlog_buffer;
int status;
unsigned long len, off;
unsigned int wait_time;
@@ -134,7 +134,7 @@ static ssize_t scanlog_write(struct file * file, const char
__user * buf,
static int scanlog_open(struct inode * inode, struct file * file)
{
- unsigned int *data = PDE_DATA(file_inode(file));
+ unsigned int *data = scanlog_buffer;
if (data[0] != 0) {
/* This imperfect test stops a second copy of the
@@ -150,10 +150,9 @@ static int scanlog_open(struct inode * inode, struct file
* file)
static int scanlog_release(struct inode * inode, struct file * file)
{
- unsigned int *data = PDE_DATA(file_inode(file));
+ unsigned int *data = scanlog_buffer;
data[0] = 0;
-
return 0;
}
@@ -169,7 +168,6 @@ const struct file_operations scanlog_fops = {
static int __init scanlog_init(void)
{
struct proc_dir_entry *ent;
- void *data;
int err = -ENOMEM;
ibm_scan_log_dump = rtas_token(ibm,scan-log-dump);
@@ -177,29 +175,24 @@ static int __init scanlog_init(void)
return -ENODEV;
/* Ideally we could allocate a buffer 4G */
- data = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
- if (!data)
+ scanlog_buffer = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
+ if (!scanlog_buffer)
goto err;
- ent = proc_create_data(powerpc/rtas/scan-log-dump, S_IRUSR, NULL,
- scanlog_fops, data);
+ ent = proc_create(powerpc/rtas/scan-log-dump, S_IRUSR, NULL,
+ scanlog_fops);
if (!ent)
goto err;
-
- proc_ppc64_scan_log_dump = ent;
-
return 0;
err:
- kfree(data);
+ kfree(scanlog_buffer);
return err;
}
static void __exit scanlog_cleanup(void)
{
- if (proc_ppc64_scan_log_dump) {
- kfree(proc_ppc64_scan_log_dump-data);
- remove_proc_entry(scan-log-dump,
proc_ppc64_scan_log_dump-parent);
- }
+ remove_proc_entry(powerpc/rtas/scan-log-dump, NULL);
+ kfree(scanlog_buffer);
}
module_init(scanlog_init);
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH 23/28] ppc: Clean up scanlog [RFC]
Clean up the pseries scanlog driver's use of procfs:
(1) Don't need to save the proc_dir_entry pointer as we have the filename to
remove with.
(2) Save the scan log buffer pointer in a static variable (there is only one
of it) and don't save it in the PDE (which doesn't have a destructor).
Signed-off-by: David Howells dhowe...@redhat.com
cc: Benjamin Herrenschmidt b...@kernel.crashing.org
cc: Paul Mackerras pau...@samba.org
cc: linuxppc-dev@lists.ozlabs.org
---
arch/powerpc/platforms/pseries/scanlog.c | 29 +++--
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/scanlog.c
b/arch/powerpc/platforms/pseries/scanlog.c
index cc220d2..b502ab6 100644
--- a/arch/powerpc/platforms/pseries/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -41,12 +41,12 @@
static unsigned int ibm_scan_log_dump; /* RTAS token */
-static struct proc_dir_entry *proc_ppc64_scan_log_dump;/* The proc
file */
+static unsigned int *scanlog_buffer; /* The data buffer */
static ssize_t scanlog_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
- unsigned int *data = PDE_DATA(file_inode(file));
+ unsigned int *data = scanlog_buffer;
int status;
unsigned long len, off;
unsigned int wait_time;
@@ -134,7 +134,7 @@ static ssize_t scanlog_write(struct file * file, const char
__user * buf,
static int scanlog_open(struct inode * inode, struct file * file)
{
- unsigned int *data = PDE_DATA(file_inode(file));
+ unsigned int *data = scanlog_buffer;
if (data[0] != 0) {
/* This imperfect test stops a second copy of the
@@ -150,10 +150,9 @@ static int scanlog_open(struct inode * inode, struct file
* file)
static int scanlog_release(struct inode * inode, struct file * file)
{
- unsigned int *data = PDE_DATA(file_inode(file));
+ unsigned int *data = scanlog_buffer;
data[0] = 0;
-
return 0;
}
@@ -169,7 +168,6 @@ const struct file_operations scanlog_fops = {
static int __init scanlog_init(void)
{
struct proc_dir_entry *ent;
- void *data;
int err = -ENOMEM;
ibm_scan_log_dump = rtas_token(ibm,scan-log-dump);
@@ -177,29 +175,24 @@ static int __init scanlog_init(void)
return -ENODEV;
/* Ideally we could allocate a buffer 4G */
- data = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
- if (!data)
+ scanlog_buffer = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
+ if (!scanlog_buffer)
goto err;
- ent = proc_create_data(powerpc/rtas/scan-log-dump, S_IRUSR, NULL,
- scanlog_fops, data);
+ ent = proc_create(powerpc/rtas/scan-log-dump, S_IRUSR, NULL,
+ scanlog_fops);
if (!ent)
goto err;
-
- proc_ppc64_scan_log_dump = ent;
-
return 0;
err:
- kfree(data);
+ kfree(scanlog_buffer);
return err;
}
static void __exit scanlog_cleanup(void)
{
- if (proc_ppc64_scan_log_dump) {
- kfree(proc_ppc64_scan_log_dump-data);
- remove_proc_entry(scan-log-dump,
proc_ppc64_scan_log_dump-parent);
- }
+ remove_proc_entry(powerpc/rtas/scan-log-dump, NULL);
+ kfree(scanlog_buffer);
}
module_init(scanlog_init);
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
