[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20071115161536.GI6216@localhost.sw.ru>
Date: Thu, 15 Nov 2007 19:15:36 +0300
From: Alexey Dobriyan <adobriyan@...ru>
To: akpm@...l.org
Cc: linux-kernel@...r.kernel.org, devel@...nvz.org
Subject: [PATCH] proc: remove useless checks in proc_register()
Before proc_register() all PDEs are created by proc_create() which
doesn't set ->proc_iops and ->proc_fops -- they're NULL. So those
branches in proc_register() always taken.
Signed-off-by: Alexey Dobriyan <adobriyan@...ru>
---
fs/proc/generic.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -525,19 +525,14 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
dp->low_ino = i;
if (S_ISDIR(dp->mode)) {
- if (dp->proc_iops == NULL) {
- dp->proc_fops = &proc_dir_operations;
- dp->proc_iops = &proc_dir_inode_operations;
- }
+ dp->proc_fops = &proc_dir_operations;
+ dp->proc_iops = &proc_dir_inode_operations;
dir->nlink++;
} else if (S_ISLNK(dp->mode)) {
- if (dp->proc_iops == NULL)
- dp->proc_iops = &proc_link_inode_operations;
+ dp->proc_iops = &proc_link_inode_operations;
} else if (S_ISREG(dp->mode)) {
- if (dp->proc_fops == NULL)
- dp->proc_fops = &proc_file_operations;
- if (dp->proc_iops == NULL)
- dp->proc_iops = &proc_file_inode_operations;
+ dp->proc_fops = &proc_file_operations;
+ dp->proc_iops = &proc_file_inode_operations;
}
spin_lock(&proc_subdir_lock);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists