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 <[email protected]>
---
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);
}
/*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
