From fd938c2f4d082b21f95d33ddce310ac3d693f7ca Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Fri, 8 Feb 2008 04:18:27 -0800 Subject: [PATCH] --- yaml --- r: 84610 b: refs/heads/master c: 76df0c25d0c34eba9fbb8a44106ed096553ba0e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/proc/generic.c | 18 ++++++------------ trunk/fs/proc/proc_tty.c | 3 --- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 30c03f1df7c7..802097a83623 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4237e0d3de38da640d7c977d68f5f7f1d207a631 +refs/heads/master: 76df0c25d0c34eba9fbb8a44106ed096553ba0e8 diff --git a/trunk/fs/proc/generic.c b/trunk/fs/proc/generic.c index 75cd8d709f7f..1c91eed26451 100644 --- a/trunk/fs/proc/generic.c +++ b/trunk/fs/proc/generic.c @@ -25,12 +25,6 @@ #include "internal.h" -static ssize_t proc_file_read(struct file *file, char __user *buf, - size_t nbytes, loff_t *ppos); -static ssize_t proc_file_write(struct file *file, const char __user *buffer, - size_t count, loff_t *ppos); -static loff_t proc_file_lseek(struct file *, loff_t, int); - DEFINE_SPINLOCK(proc_subdir_lock); static int proc_match(int len, const char *name, struct proc_dir_entry *de) @@ -40,12 +34,6 @@ static int proc_match(int len, const char *name, struct proc_dir_entry *de) return !memcmp(name, de->name, len); } -static const struct file_operations proc_file_operations = { - .llseek = proc_file_lseek, - .read = proc_file_read, - .write = proc_file_write, -}; - /* buffer size is one page but our output routines use some slack for overruns */ #define PROC_BLOCK_SIZE (PAGE_SIZE - 1024) @@ -233,6 +221,12 @@ proc_file_lseek(struct file *file, loff_t offset, int orig) return retval; } +static const struct file_operations proc_file_operations = { + .llseek = proc_file_lseek, + .read = proc_file_read, + .write = proc_file_write, +}; + static int proc_notify_change(struct dentry *dentry, struct iattr *iattr) { struct inode *inode = dentry->d_inode; diff --git a/trunk/fs/proc/proc_tty.c b/trunk/fs/proc/proc_tty.c index 22846225acfa..34296839b417 100644 --- a/trunk/fs/proc/proc_tty.c +++ b/trunk/fs/proc/proc_tty.c @@ -15,9 +15,6 @@ #include #include -static int tty_ldiscs_read_proc(char *page, char **start, off_t off, - int count, int *eof, void *data); - /* * The /proc/tty directory inodes... */