* [merged] mm-use-seq_open_private-instead-of-seq_open.patch removed from -mm tree
@ 2014-10-13 18:20 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2014-10-13 18:20 UTC (permalink / raw)
To: rob.jones, mm-commits
The patch titled
Subject: mm/vmalloc.c: use seq_open_private() instead of seq_open()
has been removed from the -mm tree. Its filename was
mm-use-seq_open_private-instead-of-seq_open.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Rob Jones <rob.jones@codethink.co.uk>
Subject: 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>
---
mm/vmalloc.c | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff -puN mm/vmalloc.c~mm-use-seq_open_private-instead-of-seq_open mm/vmalloc.c
--- a/mm/vmalloc.c~mm-use-seq_open_private-instead-of-seq_open
+++ a/mm/vmalloc.c
@@ -2646,21 +2646,11 @@ static const struct seq_operations vmall
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 = {
_
Patches currently in -mm which might be from rob.jones@codethink.co.uk are
origin.patch
lib-use-seq_open_private-instead-of-seq_open.patch
kernel-kallsymsc-use-__seq_open_private.patch
ipc-use-__seq_open_private-instead-of-seq_open.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-10-13 18:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-13 18:20 [merged] mm-use-seq_open_private-instead-of-seq_open.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.