diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2003-05-13 02:22:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2003-05-13 02:22:33 -0700 |
| commit | fa72effd0a10ff968f0c4e3190a283728be010f3 (patch) | |
| tree | 86252acb92c7d8862a856fb94ea5a338bb32eaa4 /include | |
| parent | 2c41af2811466a85f85ec9d8165d4f1c5bc4a552 (diff) | |
| parent | 162132e0c996e74e75761894100d57e90db2d194 (diff) | |
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 14 | ||||
| -rw-r--r-- | include/linux/sunrpc/rpc_pipe_fs.h | 4 | ||||
| -rw-r--r-- | include/net/sock.h | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 6363727f6204..e514d070e334 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -521,12 +521,12 @@ extern struct list_head file_lock_list; #include <linux/fcntl.h> -extern int fcntl_getlk(struct file *, struct flock *); -extern int fcntl_setlk(struct file *, unsigned int, struct flock *); +extern int fcntl_getlk(struct file *, struct flock __user *); +extern int fcntl_setlk(struct file *, unsigned int, struct flock __user *); #if BITS_PER_LONG == 32 -extern int fcntl_getlk64(struct file *, struct flock64 *); -extern int fcntl_setlk64(struct file *, unsigned int, struct flock64 *); +extern int fcntl_getlk64(struct file *, struct flock64 __user *); +extern int fcntl_setlk64(struct file *, unsigned int, struct flock64 __user *); #endif /* fs/locks.c */ @@ -1263,8 +1263,8 @@ void inode_set_bytes(struct inode *inode, loff_t bytes); extern int vfs_readdir(struct file *, filldir_t, void *); -extern int vfs_stat(char *, struct kstat *); -extern int vfs_lstat(char *, struct kstat *); +extern int vfs_stat(char __user *, struct kstat *); +extern int vfs_lstat(char __user *, struct kstat *); extern int vfs_fstat(unsigned int, struct kstat *); extern struct file_system_type *get_fs_type(const char *name); @@ -1291,7 +1291,7 @@ extern int simple_commit_write(struct file *file, struct page *page, unsigned offset, unsigned to); extern struct dentry *simple_lookup(struct inode *, struct dentry *); -extern ssize_t generic_read_dir(struct file *, char *, size_t, loff_t *); +extern ssize_t generic_read_dir(struct file *, char __user *, size_t, loff_t *); extern struct file_operations simple_dir_operations; extern struct inode_operations simple_dir_inode_operations; struct tree_descr { char *name; struct file_operations *ops; int mode; }; diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h index b6c2c0fabc4d..478e405e9c83 100644 --- a/include/linux/sunrpc/rpc_pipe_fs.h +++ b/include/linux/sunrpc/rpc_pipe_fs.h @@ -12,8 +12,8 @@ struct rpc_pipe_msg { }; struct rpc_pipe_ops { - ssize_t (*upcall)(struct file *, struct rpc_pipe_msg *, char *, size_t); - ssize_t (*downcall)(struct file *, const char *, size_t); + ssize_t (*upcall)(struct file *, struct rpc_pipe_msg *, char __user *, size_t); + ssize_t (*downcall)(struct file *, const char __user *, size_t); void (*destroy_msg)(struct rpc_pipe_msg *); }; diff --git a/include/net/sock.h b/include/net/sock.h index 53639300bc3c..5a932eaa0152 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -405,12 +405,12 @@ extern void sock_wfree(struct sk_buff *skb); extern void sock_rfree(struct sk_buff *skb); extern int sock_setsockopt(struct socket *sock, int level, - int op, char *optval, + int op, char __user *optval, int optlen); extern int sock_getsockopt(struct socket *sock, int level, - int op, char *optval, - int *optlen); + int op, char __user *optval, + int __user *optlen); extern struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size, int noblock, |