diff options
-rw-r--r-- | fs/proc/generic.c | 25 | ||||
-rw-r--r-- | include/linux/proc_fs.h | 1 |
2 files changed, 0 insertions, 26 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 6bce60703c76..51fcb201e289 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
@@ -196,30 +196,6 @@ proc_file_read(struct file *file, char __user *buf, size_t nbytes, | |||
196 | return rv; | 196 | return rv; |
197 | } | 197 | } |
198 | 198 | ||
199 | static ssize_t | ||
200 | proc_file_write(struct file *file, const char __user *buffer, | ||
201 | size_t count, loff_t *ppos) | ||
202 | { | ||
203 | struct proc_dir_entry *pde = PDE(file_inode(file)); | ||
204 | ssize_t rv = -EIO; | ||
205 | |||
206 | if (pde->write_proc) { | ||
207 | spin_lock(&pde->pde_unload_lock); | ||
208 | if (!pde->proc_fops) { | ||
209 | spin_unlock(&pde->pde_unload_lock); | ||
210 | return rv; | ||
211 | } | ||
212 | pde->pde_users++; | ||
213 | spin_unlock(&pde->pde_unload_lock); | ||
214 | |||
215 | /* FIXME: does this routine need ppos? probably... */ | ||
216 | rv = pde->write_proc(file, buffer, count, pde->data); | ||
217 | pde_users_dec(pde); | ||
218 | } | ||
219 | return rv; | ||
220 | } | ||
221 | |||
222 | |||
223 | static loff_t | 199 | static loff_t |
224 | proc_file_lseek(struct file *file, loff_t offset, int orig) | 200 | proc_file_lseek(struct file *file, loff_t offset, int orig) |
225 | { | 201 | { |
@@ -239,7 +215,6 @@ proc_file_lseek(struct file *file, loff_t offset, int orig) | |||
239 | static const struct file_operations proc_file_operations = { | 215 | static const struct file_operations proc_file_operations = { |
240 | .llseek = proc_file_lseek, | 216 | .llseek = proc_file_lseek, |
241 | .read = proc_file_read, | 217 | .read = proc_file_read, |
242 | .write = proc_file_write, | ||
243 | }; | 218 | }; |
244 | 219 | ||
245 | static int proc_notify_change(struct dentry *dentry, struct iattr *iattr) | 220 | static int proc_notify_change(struct dentry *dentry, struct iattr *iattr) |
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 94dfb2aa5533..4f4137a0bd8a 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
@@ -72,7 +72,6 @@ struct proc_dir_entry { | |||
72 | struct proc_dir_entry *next, *parent, *subdir; | 72 | struct proc_dir_entry *next, *parent, *subdir; |
73 | void *data; | 73 | void *data; |
74 | read_proc_t *read_proc; | 74 | read_proc_t *read_proc; |
75 | write_proc_t *write_proc; | ||
76 | atomic_t count; /* use count */ | 75 | atomic_t count; /* use count */ |
77 | int pde_users; /* number of callers into module in progress */ | 76 | int pde_users; /* number of callers into module in progress */ |
78 | struct completion *pde_unload_completion; | 77 | struct completion *pde_unload_completion; |