Home » Mailing list archives » linux-kernel » 2008 » April » 29

[PATCH 8/12] powerpc: assign PDE->data before gluing PDE into /proc tree

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Denis V. Lunev <den@...>
To: <akpm@...>
Cc: <linux-kernel@...>, Denis V. Lunev <den@...>, Alexey Dobriyan <adobriyan@...>, Eric W. Biederman <ebiederm@...>, Paul Mackerras <paulus@...>
Subject: [PATCH 8/12] powerpc: assign PDE-&gt;data before gluing PDE into /proc tree
Date: Tuesday, April 29, 2008 - 7:13 am

Simply replace proc_create and further data assigned with proc_create_data.
No need to check for data!=NULL after that.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Paul Mackerras <paulus@au.ibm.com>
---
 arch/powerpc/platforms/pseries/scanlog.c |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c
index e5b0ea8..7a76f63 100644
--- a/arch/powerpc/platforms/pseries/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -57,11 +57,6 @@ static ssize_t scanlog_read(struct file *file, char __user *buf,
         dp = PDE(inode);
  	data = (unsigned int *)dp->data;
 
-	if (!data) {
-		printk(KERN_ERR "scanlog: read failed no data\n");
-		return -EIO;
-	}
-
 	if (count > RTAS_DATA_BUF_SIZE)
 		count = RTAS_DATA_BUF_SIZE;
 
@@ -153,11 +148,6 @@ static int scanlog_open(struct inode * inode, struct file * file)
 	struct proc_dir_entry *dp = PDE(inode);
 	unsigned int *data = (unsigned int *)dp->data;
 
-	if (!data) {
-		printk(KERN_ERR "scanlog: open failed no data\n");
-		return -EIO;
-	}
-
 	if (data[0] != 0) {
 		/* This imperfect test stops a second copy of the
 		 * data (or a reset while data is being copied)
@@ -175,10 +165,6 @@ static int scanlog_release(struct inode * inode, struct file * file)
 	struct proc_dir_entry *dp = PDE(inode);
 	unsigned int *data = (unsigned int *)dp->data;
 
-	if (!data) {
-		printk(KERN_ERR "scanlog: release failed no data\n");
-		return -EIO;
-	}
 	data[0] = 0;
 
 	return 0;
@@ -207,12 +193,11 @@ static int __init scanlog_init(void)
 	if (!data)
 		goto err;
 
-	ent = proc_create("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
-			  &scanlog_fops);
+	ent = proc_create_data("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
+			       &scanlog_fops, data);
 	if (!ent)
 		goto err;
 
-	ent->data = data;
 	proc_ppc64_scan_log_dump = ent;
 
 	return 0;
-- 
1.5.3.rc5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/12] Further PDE-&gt;data assignments cleanups, Denis V. Lunev, (Tue Apr 29, 7:12 am)
[PATCH 8/12] powerpc: assign PDE->data before gluing PDE ..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
[PATCH 7/12] cciss: assign PDE-&gt;data before gluing PDE in..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
RE: [PATCH 7/12] cciss: assign PDE-&gt;data before gluing PD..., Miller, Mike (OS Dev), (Tue Apr 29, 11:26 am)
[PATCH 9/12] ipv4: assign PDE-&gt;data before gluing PDE int..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 9/12] ipv4: assign PDE-&gt;data before gluing PDE..., Stoyan Gaydarov, (Fri Jul 11, 11:12 pm)
Re: [PATCH 9/12] ipv4: assign PDE-&gt;data before gluing PDE..., Denis V. Lunev, (Sat Jul 12, 10:55 am)
Re: [PATCH 9/12] ipv4: assign PDE-&gt;data before gluing PDE..., Eric W. Biederman, (Fri Jul 11, 11:42 pm)
Re: [PATCH 9/12] ipv4: assign PDE-&gt;data before gluing PDE..., David Miller, (Fri May 2, 7:10 am)
[PATCH 3/12] net: assign PDE-&gt;data before gluing PDE into..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 3/12] net: assign PDE-&gt;data before gluing PDE ..., David Miller, (Fri May 2, 5:46 am)
[PATCH 5/12] atm: assign PDE-&gt;data before gluing PDE into..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 5/12] atm: assign PDE-&gt;data before gluing PDE ..., David Miller, (Fri May 2, 7:08 am)
[PATCH 4/12] ipv6: assign PDE-&gt;data before gluing PDE int..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 4/12] ipv6: assign PDE-&gt;data before gluing PDE..., David Miller, (Fri May 2, 5:47 am)
[PATCH 11/12] netfilter: assign PDE-&gt;data before gluing P..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 11/12] netfilter: assign PDE-&gt;data before glui..., David Miller, (Fri May 2, 7:12 am)
Re: [PATCH 11/12] netfilter: assign PDE-&gt;data before glui..., Patrick McHardy, (Tue Apr 29, 8:01 am)
[PATCH 10/12] netfilter: assign PDE-&gt;fops before gluing P..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 10/12] netfilter: assign PDE-&gt;fops before glui..., David Miller, (Fri May 2, 7:11 am)
[PATCH 6/12] vlan: assign PDE-&gt;data before gluing PDE int..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 6/12] vlan: assign PDE-&gt;data before gluing PDE..., David Miller, (Fri May 2, 7:09 am)
[PATCH 2/12] netfilter: assign PDE-&gt;data before gluing PD..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 2/12] netfilter: assign PDE-&gt;data before gluin..., David Miller, (Fri May 2, 5:45 am)
[PATCH 12/12] netns: assign PDE-&gt;data before gluing entry..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 12/12] netns: assign PDE-&gt;data before gluing e..., David Miller, (Fri May 2, 7:12 am)
[PATCH 1/12] sunrpc: assign PDE-&gt;data before gluing PDE i..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 1/12] sunrpc: assign PDE-&gt;data before gluing P..., David Miller, (Fri May 2, 5:44 am)