summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorRob Jones <rob.jones@codethink.co.uk>2014-10-09 15:28:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-09 22:25:56 -0400
commit703394c1005caeccaaf64945c1b6d6cc3af0cd1d (patch)
treec7af9d0884ba876482e5d73b8d2218be1776f5a7 /mm
parent1c93923cc264105418e6ead149c76bd88302eff4 (diff)
downloadop-kernel-dev-703394c1005caeccaaf64945c1b6d6cc3af0cd1d.zip
op-kernel-dev-703394c1005caeccaaf64945c1b6d6cc3af0cd1d.tar.gz
mm/vmalloc.c: use seq_open_private() instead of seq_open()
Using seq_open_private() removes boilerplate code from vmalloc_open(). The resultant code is shorter and easier to follow. However, please note that seq_open_private() call kzalloc() rather than kmalloc() which may affect timing due to the memory initialisation overhead. Signed-off-by: Rob Jones <rob.jones@codethink.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/vmalloc.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 2b0aa54..90520af 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2646,21 +2646,11 @@ static const struct seq_operations vmalloc_op = {
static int vmalloc_open(struct inode *inode, struct file *file)
{
- unsigned int *ptr = NULL;
- int ret;
-
- if (IS_ENABLED(CONFIG_NUMA)) {
- ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL);
- if (ptr == NULL)
- return -ENOMEM;
- }
- ret = seq_open(file, &vmalloc_op);
- if (!ret) {
- struct seq_file *m = file->private_data;
- m->private = ptr;
- } else
- kfree(ptr);
- return ret;
+ if (IS_ENABLED(CONFIG_NUMA))
+ return seq_open_private(file, &vmalloc_op,
+ nr_node_ids * sizeof(unsigned int));
+ else
+ return seq_open(file, &vmalloc_op);
}
static const struct file_operations proc_vmalloc_operations = {
OpenPOWER on IntegriCloud