summaryrefslogtreecommitdiff
path: root/net/socket.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.ninka.net>2002-07-28 08:54:50 -0700
committerDavid S. Miller <davem@nuts.ninka.net>2002-07-28 08:54:50 -0700
commit856d8b52fe04b6870111eaace963ee3ebc692050 (patch)
treeac86a9cd9b32a79270abc7d208fa2a49b0cbaa16 /net/socket.c
parent3f0c2c5bf51916b997219be6e06c2aa61da0b5c7 (diff)
parentd0c91cb7127b4a086c04257ce827686cb7bbbdb3 (diff)
Merge nuts.ninka.net:/home/davem/src/BK/BAK-net-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/net/socket.c b/net/socket.c
index 680b617772f3..53dcf8bf9c83 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -112,18 +112,18 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
*/
static struct file_operations socket_file_ops = {
- llseek: no_llseek,
- read: sock_read,
- write: sock_write,
- poll: sock_poll,
- ioctl: sock_ioctl,
- mmap: sock_mmap,
- open: sock_no_open, /* special open code to disallow open via /proc */
- release: sock_close,
- fasync: sock_fasync,
- readv: sock_readv,
- writev: sock_writev,
- sendpage: sock_sendpage
+ .llseek = no_llseek,
+ .read = sock_read,
+ .write = sock_write,
+ .poll = sock_poll,
+ .ioctl = sock_ioctl,
+ .mmap = sock_mmap,
+ .open = sock_no_open, /* special open code to disallow open via /proc */
+ .release = sock_close,
+ .fasync = sock_fasync,
+ .readv = sock_readv,
+ .writev = sock_writev,
+ .sendpage = sock_sendpage
};
/*
@@ -312,9 +312,9 @@ static int init_inodecache(void)
}
static struct super_operations sockfs_ops = {
- alloc_inode: sock_alloc_inode,
- destroy_inode: sock_destroy_inode,
- statfs: simple_statfs,
+ .alloc_inode = sock_alloc_inode,
+ .destroy_inode =sock_destroy_inode,
+ .statfs = simple_statfs,
};
static struct super_block *sockfs_get_sb(struct file_system_type *fs_type,
@@ -326,16 +326,16 @@ static struct super_block *sockfs_get_sb(struct file_system_type *fs_type,
static struct vfsmount *sock_mnt;
static struct file_system_type sock_fs_type = {
- name: "sockfs",
- get_sb: sockfs_get_sb,
- kill_sb: kill_anon_super,
+ .name = "sockfs",
+ .get_sb = sockfs_get_sb,
+ .kill_sb = kill_anon_super,
};
static int sockfs_delete_dentry(struct dentry *dentry)
{
return 1;
}
static struct dentry_operations sockfs_dentry_operations = {
- d_delete: sockfs_delete_dentry,
+ .d_delete = sockfs_delete_dentry,
};
/*