Linux Container Development
 help / color / mirror / Atom feed
From: Dave Hansen <dave-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
To: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org>
Cc: containers
	<containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>,
	"linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
	<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	Dave Hansen
	<dave-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>,
	hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org,
	Alexey Dobriyan
	<adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [RFC][PATCH 2/8] breakout fdinfo sprintf() into its own function
Date: Fri, 27 Feb 2009 12:34:26 -0800	[thread overview]
Message-ID: <20090227203426.9F73083F@kernel> (raw)
In-Reply-To: <20090227203425.F3B51176@kernel>


I'll be adding to this in a moment and it is in a bad place
to do that cleanly now.

Also, increase the buffer size.  Most /proc files can
output up to a page, so use the same here.

Signed-off-by: Dave Hansen <dave-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
---

 linux-2.6.git-dave/fs/proc/base.c |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff -puN fs/proc/base.c~breakout-fdinfo fs/proc/base.c
--- linux-2.6.git/fs/proc/base.c~breakout-fdinfo	2009-02-27 12:07:37.000000000 -0800
+++ linux-2.6.git-dave/fs/proc/base.c	2009-02-27 12:07:37.000000000 -0800
@@ -1632,7 +1632,18 @@ out:
 	return ~0U;
 }
 
-#define PROC_FDINFO_MAX 64
+#define PROC_FDINFO_MAX PAGE_SIZE
+
+static void proc_fd_write_info(struct file *file, char *info)
+{
+	int max = PROC_FDINFO_MAX;
+	int p = 0;
+	if (!info)
+		return;
+
+	p += snprintf(info+p, max-p, "pos:\t%lli\n", (long long) file->f_pos);
+	p += snprintf(info+p, max-p, "flags:\t0%o\n", file->f_flags);
+}
 
 static int proc_fd_info(struct inode *inode, struct path *path, char *info)
 {
@@ -1657,12 +1668,7 @@ static int proc_fd_info(struct inode *in
 				*path = file->f_path;
 				path_get(&file->f_path);
 			}
-			if (info)
-				snprintf(info, PROC_FDINFO_MAX,
-					 "pos:\t%lli\n"
-					 "flags:\t0%o\n",
-					 (long long) file->f_pos,
-					 file->f_flags);
+			proc_fd_write_info(file, info);
 			spin_unlock(&files->file_lock);
 			put_files_struct(files);
 			return 0;
@@ -1870,10 +1876,11 @@ static int proc_readfd(struct file *filp
 static ssize_t proc_fdinfo_read(struct file *file, char __user *buf,
 				      size_t len, loff_t *ppos)
 {
-	char tmp[PROC_FDINFO_MAX];
+	char *tmp = kmalloc(PROC_FDINFO_MAX, GFP_KERNEL);
 	int err = proc_fd_info(file->f_path.dentry->d_inode, NULL, tmp);
 	if (!err)
 		err = simple_read_from_buffer(buf, len, ppos, tmp, strlen(tmp));
+	kfree(tmp);
 	return err;
 }
 
_

       reply	other threads:[~2009-02-27 20:34 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20090227203425.F3B51176@kernel>
2009-02-27 20:34 ` Dave Hansen [this message]
2009-02-27 20:56   ` [RFC][PATCH 2/8] breakout fdinfo sprintf() into its own function Vegard Nossum
     [not found]   ` <19f34abd0902271256r49a06336rcba56234c06645a7@mail.gmail.com>
     [not found]     ` <19f34abd0902271256r49a06336rcba56234c06645a7-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-02-27 21:23       ` Dave Hansen
2009-02-27 20:34 ` [RFC][PATCH 3/8] create fs flags to mark c/r supported fs's Dave Hansen
2009-02-27 21:16   ` Alexey Dobriyan
     [not found]     ` <20090227211620.GA3326-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>
2009-02-27 21:20       ` Dave Hansen
2009-02-27 20:34 ` [RFC][PATCH 4/8] file c/r: expose functions to query fs support Dave Hansen
2009-02-27 21:14   ` Sukadev Bhattiprolu
     [not found]   ` <20090227211408.GB19872@us.ibm.com>
     [not found]     ` <20090227211408.GB19872-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2009-02-27 21:24       ` Dave Hansen
     [not found]     ` <1235769880.26788.394.camel@nimitz>
2009-02-27 21:32       ` Dave Hansen
2009-02-28  1:33   ` Sukadev Bhattiprolu
2009-02-27 20:34 ` [RFC][PATCH 5/8] add f_op for checkpointability Dave Hansen
2009-02-28  2:14   ` Sukadev Bhattiprolu
     [not found]     ` <20090228021412.GD19872-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2009-02-28  2:51       ` Dave Hansen
2009-02-28 20:53   ` Christoph Hellwig
     [not found]   ` <20090228205329.GB4254@infradead.org>
     [not found]     ` <1235857026.26788.421.camel@nimitz>
2009-03-01 15:19       ` Serge E. Hallyn
     [not found]     ` <20090228205329.GB4254-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2009-02-28 21:37       ` Dave Hansen
2009-03-02 17:05       ` Dave Hansen
     [not found]     ` <1236013556.26788.466.camel@nimitz>
2009-03-03 13:15       ` Christoph Hellwig
     [not found]       ` <20090303131528.GB10931@infradead.org>
     [not found]         ` <20090303131528.GB10931-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2009-03-20 21:13           ` Dave Hansen
     [not found]         ` <1237583604.8286.294.camel@nimitz>
2009-03-20 21:30           ` Oren Laadan
2009-02-27 20:34 ` [RFC][PATCH 6/8] mark /dev/null and zero as checkpointable Dave Hansen
2009-02-27 20:34 ` [RFC][PATCH 7/8] add c/r info to fdinfo Dave Hansen
2009-02-27 20:34 ` [RFC][PATCH 8/8] check files for checkpointability Dave Hansen
2009-02-28  2:57   ` Sukadev Bhattiprolu
2009-03-01 19:43   ` Serge E. Hallyn
2009-03-02 13:37   ` Serge E. Hallyn
     [not found]   ` <20090302133754.GA8033@us.ibm.com>
     [not found]     ` <20090302133754.GA8033-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2009-03-02 15:56       ` Dave Hansen
2009-03-02 15:59       ` Nathan Lynch
     [not found]     ` <20090302095917.6cfeda55@thinkcentre.lan>
     [not found]       ` <20090302095917.6cfeda55-4v5LP+xe+1byhTdZtsIeww@public.gmane.org>
2009-03-02 16:27         ` Dave Hansen
2009-03-02 16:28         ` Serge E. Hallyn
     [not found]       ` <1236011251.26788.450.camel@nimitz>
2009-03-02 17:22         ` Nathan Lynch
     [not found]         ` <20090302112247.76bb3662@thinkcentre.lan>
     [not found]           ` <20090302112247.76bb3662-4v5LP+xe+1byhTdZtsIeww@public.gmane.org>
2009-03-02 17:30             ` Dave Hansen
     [not found]           ` <1236015052.26788.471.camel@nimitz>
2009-03-02 17:44             ` Serge E. Hallyn
     [not found]             ` <20090302174433.GA12708@us.ibm.com>
     [not found]               ` <20090302174433.GA12708-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2009-03-02 17:58                 ` Dave Hansen
2009-03-02 18:13                 ` Dave Hansen
2009-03-02 18:35                   ` Serge E. Hallyn
2009-03-05  8:20                   ` Cedric Le Goater
     [not found]   ` <20090228025743.GA22451@us.ibm.com>
     [not found]     ` <20090228025743.GA22451-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2009-03-01 17:00       ` Serge E. Hallyn
2009-03-04 23:41       ` Dave Hansen

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=20090227203426.9F73083F@kernel \
    --to=dave-23vcf4htsmix0ybbhkvfkdbpr1lh4cv8@public.gmane.org \
    --cc=adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=mingo-X9Un+BFzKDI@public.gmane.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox