diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-03-31 05:30:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 15:18:51 -0500 |
commit | 347f217cec74dc6b5a9b8e77c4b15f5a6879ec1a (patch) | |
tree | 8b7bbf42cc30ebc22d594d746a6342aeeff3cff7 | |
parent | 4d338e1accfc3473f7e453427dfd4f1ebf4dbbe6 (diff) |
[PATCH] uml: __user annotations
__user annotations (hppfs)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/hppfs/hppfs_kern.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c index 2ba20cdb5baa..5e6363be246f 100644 --- a/fs/hppfs/hppfs_kern.c +++ b/fs/hppfs/hppfs_kern.c | |||
@@ -216,10 +216,10 @@ static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry, | |||
216 | static struct inode_operations hppfs_file_iops = { | 216 | static struct inode_operations hppfs_file_iops = { |
217 | }; | 217 | }; |
218 | 218 | ||
219 | static ssize_t read_proc(struct file *file, char *buf, ssize_t count, | 219 | static ssize_t read_proc(struct file *file, char __user *buf, ssize_t count, |
220 | loff_t *ppos, int is_user) | 220 | loff_t *ppos, int is_user) |
221 | { | 221 | { |
222 | ssize_t (*read)(struct file *, char *, size_t, loff_t *); | 222 | ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); |
223 | ssize_t n; | 223 | ssize_t n; |
224 | 224 | ||
225 | read = file->f_dentry->d_inode->i_fop->read; | 225 | read = file->f_dentry->d_inode->i_fop->read; |
@@ -236,7 +236,7 @@ static ssize_t read_proc(struct file *file, char *buf, ssize_t count, | |||
236 | return n; | 236 | return n; |
237 | } | 237 | } |
238 | 238 | ||
239 | static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count) | 239 | static ssize_t hppfs_read_file(int fd, char __user *buf, ssize_t count) |
240 | { | 240 | { |
241 | ssize_t n; | 241 | ssize_t n; |
242 | int cur, err; | 242 | int cur, err; |
@@ -274,7 +274,7 @@ static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count) | |||
274 | return n; | 274 | return n; |
275 | } | 275 | } |
276 | 276 | ||
277 | static ssize_t hppfs_read(struct file *file, char *buf, size_t count, | 277 | static ssize_t hppfs_read(struct file *file, char __user *buf, size_t count, |
278 | loff_t *ppos) | 278 | loff_t *ppos) |
279 | { | 279 | { |
280 | struct hppfs_private *hppfs = file->private_data; | 280 | struct hppfs_private *hppfs = file->private_data; |
@@ -313,12 +313,12 @@ static ssize_t hppfs_read(struct file *file, char *buf, size_t count, | |||
313 | return(count); | 313 | return(count); |
314 | } | 314 | } |
315 | 315 | ||
316 | static ssize_t hppfs_write(struct file *file, const char *buf, size_t len, | 316 | static ssize_t hppfs_write(struct file *file, const char __user *buf, size_t len, |
317 | loff_t *ppos) | 317 | loff_t *ppos) |
318 | { | 318 | { |
319 | struct hppfs_private *data = file->private_data; | 319 | struct hppfs_private *data = file->private_data; |
320 | struct file *proc_file = data->proc_file; | 320 | struct file *proc_file = data->proc_file; |
321 | ssize_t (*write)(struct file *, const char *, size_t, loff_t *); | 321 | ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *); |
322 | int err; | 322 | int err; |
323 | 323 | ||
324 | write = proc_file->f_dentry->d_inode->i_fop->write; | 324 | write = proc_file->f_dentry->d_inode->i_fop->write; |
@@ -658,7 +658,7 @@ static struct super_operations hppfs_sbops = { | |||
658 | .statfs = hppfs_statfs, | 658 | .statfs = hppfs_statfs, |
659 | }; | 659 | }; |
660 | 660 | ||
661 | static int hppfs_readlink(struct dentry *dentry, char *buffer, int buflen) | 661 | static int hppfs_readlink(struct dentry *dentry, char __user *buffer, int buflen) |
662 | { | 662 | { |
663 | struct file *proc_file; | 663 | struct file *proc_file; |
664 | struct dentry *proc_dentry; | 664 | struct dentry *proc_dentry; |