From: Colin Cross <ccross@android.com>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org,
Alexander Viro <viro@zeniv.linux.org.uk>,
Ingo Molnar <mingo@elte.hu>,
Peter Zijlstra <peterz@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
Alexey Dobriyan <adobriyan@gmail.com>,
Colin Cross <ccross@android.com>
Subject: [PATCH 1/3] fs: seq_file: add seq_reserve
Date: Thu, 22 Sep 2011 13:57:07 -0700 [thread overview]
Message-ID: <1316725029-22737-2-git-send-email-ccross@android.com> (raw)
In-Reply-To: <1316725029-22737-1-git-send-email-ccross@android.com>
Adds a seq_reserve function to allow users of the seq_file interface to
increase the initial size of the buffer. Avoids repeated allocations and
calls to the show function in cases where large buffers of known size are
needed.
Signed-off-by: Colin Cross <ccross@android.com>
---
fs/seq_file.c | 30 ++++++++++++++++++++++++++++++
include/linux/seq_file.h | 1 +
2 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/fs/seq_file.c b/fs/seq_file.c
index 05d6b0e..8d9778c 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -62,6 +62,36 @@ int seq_open(struct file *file, const struct seq_operations *op)
}
EXPORT_SYMBOL(seq_open);
+/**
+ * seq_reserve - increase initial buffer for sequential file
+ * @m: target buffer
+ * @size: size in bytes to reserve
+ *
+ * seq_reserve() increases the initial size of the seq_file buffer. Can
+ * be used to avoid future allocations and repeated calls to the show
+ * function for large buffers of known size.
+ * Returns 0 on success, or -ENOMEM if the buffer cannot be allocated.
+ */
+int seq_reserve(struct seq_file *m, size_t size)
+{
+ void *buf;
+
+ /* don't ask for more than the kmalloc() max size */
+ if (size > KMALLOC_MAX_SIZE)
+ size = KMALLOC_MAX_SIZE;
+
+ buf = kmalloc(size, GFP_KERNEL);
+ if (!buf)
+ return -ENOMEM;
+
+ kfree(m->buf);
+ m->buf = buf;
+ m->size = size;
+
+ return 0;
+}
+EXPORT_SYMBOL(seq_reserve);
+
static int traverse(struct seq_file *m, loff_t offset)
{
loff_t pos = 0, index;
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 03c0232..ad93319 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -75,6 +75,7 @@ static inline void seq_commit(struct seq_file *m, int num)
char *mangle_path(char *s, char *p, char *esc);
int seq_open(struct file *, const struct seq_operations *);
+int seq_reserve(struct seq_file *m, size_t size);
ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
loff_t seq_lseek(struct file *, loff_t, int);
int seq_release(struct inode *, struct file *);
--
1.7.4.1
next prev parent reply other threads:[~2011-09-22 20:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-22 20:57 [PATCH 0/3] Replace kmalloc with vmalloc in seq_files Colin Cross
2011-09-22 20:57 ` Colin Cross [this message]
2011-09-22 22:54 ` [PATCH 1/3] fs: seq_file: add seq_reserve Alan Cox
2011-09-22 23:24 ` Colin Cross
2011-09-22 23:24 ` Colin Cross
2011-09-22 20:57 ` [PATCH 2/3] sched_stats: use the new seq_reserve function Colin Cross
2011-09-22 20:57 ` [PATCH 3/3] seq_file: convert seq buffer to vmalloc Colin Cross
2011-09-22 21:07 ` Joe Perches
2011-09-22 21:19 ` Colin Cross
2011-09-22 21:19 ` Colin Cross
2011-09-22 23:26 ` NamJae Jeon
2011-09-22 21:20 ` Peter Zijlstra
2011-09-22 21:22 ` [PATCH 0/3] Replace kmalloc with vmalloc in seq_files Peter Zijlstra
2011-09-22 21:23 ` Christoph Hellwig
2011-09-23 0:00 ` Colin Cross
2011-09-23 0:00 ` Colin Cross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316725029-22737-2-git-send-email-ccross@android.com \
--to=ccross@android.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.