public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Fengguang Wu <wfg@mail.ustc.edu.cn>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
	Al Viro <viro@ftp.linux.org.uk>
Subject: [PATCH] seqfile: merge duplite code to seq_open_private()
Date: Wed, 15 Aug 2007 17:05:50 +0800	[thread overview]
Message-ID: <387168750.10594@ustc.edu.cn> (raw)
Message-ID: <20070815090549.GB19893@mail.ustc.edu.cn> (raw)
In-Reply-To: <20070815085637.GA19293@mail.ustc.edu.cn>

There are dozens of calls to seq_open() that need to set m->private.
Introduce seq_open_private() to remove code duplications.

Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
---
Andrew: more conversions will be made if this patch is ok.

 fs/nfs/client.c          |   24 ++----------------------
 fs/seq_file.c            |   10 ++++++++++
 include/linux/seq_file.h |    1 +
 3 files changed, 13 insertions(+), 22 deletions(-)

--- linux-2.6.23-rc2-mm2.orig/include/linux/seq_file.h
+++ linux-2.6.23-rc2-mm2/include/linux/seq_file.h
@@ -33,6 +33,7 @@ struct seq_operations {
 };
 
 int seq_open(struct file *, const struct seq_operations *);
+int seq_open_private(struct file *, struct seq_operations *, void *);
 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 *);
--- linux-2.6.23-rc2-mm2.orig/fs/seq_file.c
+++ linux-2.6.23-rc2-mm2/fs/seq_file.c
@@ -53,6 +53,16 @@ int seq_open(struct file *file, const st
 }
 EXPORT_SYMBOL(seq_open);
 
+int seq_open_private(struct file *file, struct seq_operations *op, void *data)
+{
+	int ret = seq_open(file, op);
+
+	if (!ret)
+		((struct seq_file *)file->private_data)->private = data;
+
+	return ret;
+}
+EXPORT_SYMBOL(seq_open_private);
 /**
  *	seq_read -	->read() method for sequential files.
  *	@file: the file to read from
--- linux-2.6.23-rc2-mm2.orig/fs/nfs/client.c
+++ linux-2.6.23-rc2-mm2/fs/nfs/client.c
@@ -1188,17 +1188,7 @@ static const struct file_operations nfs_
  */
 static int nfs_server_list_open(struct inode *inode, struct file *file)
 {
-	struct seq_file *m;
-	int ret;
-
-	ret = seq_open(file, &nfs_server_list_ops);
-	if (ret < 0)
-		return ret;
-
-	m = file->private_data;
-	m->private = PDE(inode)->data;
-
-	return 0;
+	return seq_open_private(file, &nfs_server_list_ops, PDE(inode)->data);
 }
 
 /*
@@ -1258,17 +1248,7 @@ static int nfs_server_list_show(struct s
  */
 static int nfs_volume_list_open(struct inode *inode, struct file *file)
 {
-	struct seq_file *m;
-	int ret;
-
-	ret = seq_open(file, &nfs_volume_list_ops);
-	if (ret < 0)
-		return ret;
-
-	m = file->private_data;
-	m->private = PDE(inode)->data;
-
-	return 0;
+	return seq_open_private(file, &nfs_volume_list_ops, PDE(inode)->data);
 }
 
 /*


      parent reply	other threads:[~2007-08-15  9:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20070815085637.GA19293@mail.ustc.edu.cn>
2007-08-15  8:56 ` [PATCH] seqfile: fix uninitialized memory allocation in mounts_open() Fengguang Wu
2007-08-15  9:04   ` Alexey Dobriyan
     [not found]     ` <20070815090855.GB19293@mail.ustc.edu.cn>
2007-08-15  9:08       ` Fengguang Wu
     [not found] ` <20070815090116.GA19893@mail.ustc.edu.cn>
2007-08-15  9:01   ` Fengguang Wu
     [not found] ` <20070815090549.GB19893@mail.ustc.edu.cn>
2007-08-15  9:05   ` Fengguang Wu [this message]

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=387168750.10594@ustc.edu.cn \
    --to=wfg@mail.ustc.edu.cn \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=viro@ftp.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox