diff options
| author | Alexander Viro <viro@www.linux.org.uk> | 2004-06-03 17:22:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-03 17:22:50 -0700 |
| commit | c6d32902cb31212e0fc467a314b94a2aaf414fb3 (patch) | |
| tree | 57d950d20f31dbd971456018449208ba4b84f2c4 /fs/devfs | |
| parent | 4bb07ce359a1d2bc9cdc260f2c800958f3b78416 (diff) | |
[PATCH] sparse: trivial fs annotations
Diffstat (limited to 'fs/devfs')
| -rw-r--r-- | fs/devfs/base.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/devfs/base.c b/fs/devfs/base.c index c7ea29114c4f..5e66bc917c28 100644 --- a/fs/devfs/base.c +++ b/fs/devfs/base.c @@ -848,13 +848,13 @@ static unsigned int boot_options = OPTION_NONE; static devfs_handle_t _devfs_walk_path(struct devfs_entry *dir, const char *name, int namelen, int traverse_symlink); -static ssize_t devfsd_read(struct file *file, char *buf, size_t len, +static ssize_t devfsd_read(struct file *file, char __user *buf, size_t len, loff_t * ppos); static int devfsd_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); static int devfsd_close(struct inode *inode, struct file *file); #ifdef CONFIG_DEVFS_DEBUG -static ssize_t stat_read(struct file *file, char *buf, size_t len, +static ssize_t stat_read(struct file *file, char __user *buf, size_t len, loff_t * ppos); static struct file_operations stat_fops = { .read = stat_read, @@ -2579,7 +2579,7 @@ static struct file_system_type devfs_fs_type = { /* File operations for devfsd follow */ -static ssize_t devfsd_read(struct file *file, char *buf, size_t len, +static ssize_t devfsd_read(struct file *file, char __user *buf, size_t len, loff_t * ppos) { int done = FALSE; @@ -2693,7 +2693,7 @@ static int devfsd_ioctl(struct inode *inode, struct file *file, switch (cmd) { case DEVFSDIOC_GET_PROTO_REV: ival = DEVFSD_PROTOCOL_REVISION_KERNEL; - if (copy_to_user((void *)arg, &ival, sizeof ival)) + if (copy_to_user((void __user *)arg, &ival, sizeof ival)) return -EFAULT; break; case DEVFSDIOC_SET_EVENT_MASK: @@ -2732,7 +2732,7 @@ static int devfsd_ioctl(struct inode *inode, struct file *file, /*break; */ #ifdef CONFIG_DEVFS_DEBUG case DEVFSDIOC_SET_DEBUG_MASK: - if (copy_from_user(&ival, (void *)arg, sizeof ival)) + if (copy_from_user(&ival, (void __user *)arg, sizeof ival)) return -EFAULT; devfs_debug = ival; break; @@ -2772,7 +2772,7 @@ static int devfsd_close(struct inode *inode, struct file *file) } /* End Function devfsd_close */ #ifdef CONFIG_DEVFS_DEBUG -static ssize_t stat_read(struct file *file, char *buf, size_t len, +static ssize_t stat_read(struct file *file, char __user *buf, size_t len, loff_t * ppos) { ssize_t num; |