diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/.cvsignore | 4 | ||||
| -rw-r--r-- | kernel/dev.c | 12 | ||||
| -rw-r--r-- | kernel/dir.c | 54 | ||||
| -rw-r--r-- | kernel/file.c | 20 | ||||
| -rw-r--r-- | kernel/inode.c | 11 |
5 files changed, 53 insertions, 48 deletions
diff --git a/kernel/.cvsignore b/kernel/.cvsignore index bd5fe06..2852fde 100644 --- a/kernel/.cvsignore +++ b/kernel/.cvsignore @@ -1,2 +1,6 @@ Makefile .deps +.*.cmd +*.mod.c +*.ko +*.s diff --git a/kernel/dev.c b/kernel/dev.c index 8b9b3fb..dcc03b1 100644 --- a/kernel/dev.c +++ b/kernel/dev.c @@ -544,12 +544,12 @@ static int fuse_dev_release(struct inode *inode, struct file *file) } static struct file_operations fuse_dev_operations = { - owner: THIS_MODULE, - read: fuse_dev_read, - write: fuse_dev_write, - poll: fuse_dev_poll, - open: fuse_dev_open, - release: fuse_dev_release, + .owner = THIS_MODULE, + .read = fuse_dev_read, + .write = fuse_dev_write, + .poll = fuse_dev_poll, + .open = fuse_dev_open, + .release = fuse_dev_release, }; int fuse_dev_init() diff --git a/kernel/dir.c b/kernel/dir.c index 23d1f01..7da5bc2 100644 --- a/kernel/dir.c +++ b/kernel/dir.c @@ -701,55 +701,55 @@ static int fuse_dentry_revalidate(struct dentry *entry, int flags) static struct inode_operations fuse_dir_inode_operations = { - lookup: fuse_lookup, - create: fuse_create, - mknod: fuse_mknod, - mkdir: fuse_mkdir, - symlink: fuse_symlink, - unlink: fuse_unlink, - rmdir: fuse_rmdir, - rename: fuse_rename, - link: fuse_link, - setattr: fuse_setattr, - permission: fuse_permission, + .lookup = fuse_lookup, + .create = fuse_create, + .mknod = fuse_mknod, + .mkdir = fuse_mkdir, + .symlink = fuse_symlink, + .unlink = fuse_unlink, + .rmdir = fuse_rmdir, + .rename = fuse_rename, + .link = fuse_link, + .setattr = fuse_setattr, + .permission = fuse_permission, #ifdef KERNEL_2_6 - getattr: fuse_getattr, + .getattr = fuse_getattr, #else - revalidate: fuse_revalidate, + .revalidate = fuse_revalidate, #endif }; static struct file_operations fuse_dir_operations = { - read: generic_read_dir, - readdir: fuse_readdir, - open: fuse_dir_open, - release: fuse_dir_release, + .read = generic_read_dir, + .readdir = fuse_readdir, + .open = fuse_dir_open, + .release = fuse_dir_release, }; static struct inode_operations fuse_file_inode_operations = { - setattr: fuse_setattr, - permission: fuse_permission, + .setattr = fuse_setattr, + .permission = fuse_permission, #ifdef KERNEL_2_6 - getattr: fuse_getattr, + .getattr = fuse_getattr, #else - revalidate: fuse_revalidate, + .revalidate = fuse_revalidate, #endif }; static struct inode_operations fuse_symlink_inode_operations = { - setattr: fuse_setattr, - readlink: fuse_readlink, - follow_link: fuse_follow_link, + .setattr = fuse_setattr, + .readlink = fuse_readlink, + .follow_link = fuse_follow_link, #ifdef KERNEL_2_6 - getattr: fuse_getattr, + .getattr = fuse_getattr, #else - revalidate: fuse_revalidate, + .revalidate = fuse_revalidate, #endif }; static struct dentry_operations fuse_dentry_opertations = { - d_revalidate: fuse_dentry_revalidate, + .d_revalidate = fuse_dentry_revalidate, }; /* diff --git a/kernel/file.c b/kernel/file.c index 184f938..e8fe696 100644 --- a/kernel/file.c +++ b/kernel/file.c @@ -359,19 +359,19 @@ static int fuse_commit_write(struct file *file, struct page *page, } static struct file_operations fuse_file_operations = { - open: fuse_open, - release: fuse_release, - fsync: fuse_fsync, - read: fuse_file_read, - write: generic_file_write, - mmap: generic_file_mmap, + .open = fuse_open, + .release = fuse_release, + .fsync = fuse_fsync, + .read = fuse_file_read, + .write = generic_file_write, + .mmap = generic_file_mmap, }; static struct address_space_operations fuse_file_aops = { - readpage: fuse_readpage, - writepage: fuse_writepage, - prepare_write: fuse_prepare_write, - commit_write: fuse_commit_write, + .readpage = fuse_readpage, + .writepage = fuse_writepage, + .prepare_write = fuse_prepare_write, + .commit_write = fuse_commit_write, }; void fuse_init_file_inode(struct inode *inode) diff --git a/kernel/inode.c b/kernel/inode.c index 55d381c..81a6fa8 100644 --- a/kernel/inode.c +++ b/kernel/inode.c @@ -112,10 +112,10 @@ static int fuse_statfs(struct super_block *sb, struct kstatfs *buf) } static struct super_operations fuse_super_operations = { - read_inode: fuse_read_inode, - clear_inode: fuse_clear_inode, - put_super: fuse_put_super, - statfs: fuse_statfs, + .read_inode = fuse_read_inode, + .clear_inode = fuse_clear_inode, + .put_super = fuse_put_super, + .statfs = fuse_statfs, }; @@ -209,7 +209,8 @@ static int fuse_read_super(struct super_block *sb, void *data, int silent) #ifdef KERNEL_2_6 static struct super_block *fuse_get_sb(struct file_system_type *fs_type, - int flags, const char *dev_name, void *raw_data) + int flags, const char *dev_name, + void *raw_data) { return get_sb_nodev(fs_type, flags, raw_data, fuse_read_super); } |