code cleanup

diff --git a/ChangeLog b/ChangeLog
index dcdfacf490a862b82a6a7a674df902fe143dd89d..b065dbfe630ffa4c4ff993bd360309331cd804a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-13  Miklos Szeredi <mszeredi@inf.bme.hu>
+
+       * Code cleanups
+
 2004-01-07  Miklos Szeredi <mszeredi@inf.bme.hu>
 
        * Released 1.1-pre1

diff --git a/example/fusexmp.c b/example/fusexmp.c
index 0926ff8f6a8ae298b7287766c4ce6a4ba5c00aaa..7af6c04181360b69d1946980322809680735dc64 100644 (file)
--- a/example/fusexmp.c
+++ b/example/fusexmp.c
@@ -269,26 +269,26 @@ static int xmp_fsync(const char *path, int isdatasync)
 }
 
 static struct fuse_operations xmp_oper = {
-    getattr:   xmp_getattr,
-    readlink:  xmp_readlink,
-    getdir:     xmp_getdir,
-    mknod:     xmp_mknod,
-    mkdir:     xmp_mkdir,
-    symlink:   xmp_symlink,
-    unlink:    xmp_unlink,
-    rmdir:     xmp_rmdir,
-    rename:     xmp_rename,
-    link:      xmp_link,
-    chmod:     xmp_chmod,
-    chown:     xmp_chown,
-    truncate:  xmp_truncate,
-    utime:     xmp_utime,
-    open:      xmp_open,
-    read:      xmp_read,
-    write:     xmp_write,
-    statfs:    xmp_statfs,
-    release:   xmp_release,
-    fsync:     xmp_fsync
+    .getattr   = xmp_getattr,
+    .readlink  = xmp_readlink,
+    .getdir    = xmp_getdir,
+    .mknod     = xmp_mknod,
+    .mkdir     = xmp_mkdir,
+    .symlink   = xmp_symlink,
+    .unlink    = xmp_unlink,
+    .rmdir     = xmp_rmdir,
+    .rename    = xmp_rename,
+    .link      = xmp_link,
+    .chmod     = xmp_chmod,
+    .chown     = xmp_chown,
+    .truncate  = xmp_truncate,
+    .utime     = xmp_utime,
+    .open      = xmp_open,
+    .read      = xmp_read,
+    .write     = xmp_write,
+    .statfs    = xmp_statfs,
+    .release   = xmp_release,
+    .fsync     = xmp_fsync
     
 };
 

diff --git a/example/hello.c b/example/hello.c
index 6b461d0b01ced48d19002488fd17665cd1ba37b6..7466b9f152e31cba60671e27face9cb6659fbed6 100644 (file)
--- a/example/hello.c
+++ b/example/hello.c
@@ -68,26 +68,10 @@ static int hello_read(const char *path, char *buf, size_t size, off_t offset)
 }
 
 static struct fuse_operations hello_oper = {
-    getattr:   hello_getattr,
-    readlink:  NULL,
-    getdir:     hello_getdir,
-    mknod:     NULL,
-    mkdir:     NULL,
-    symlink:   NULL,
-    unlink:    NULL,
-    rmdir:     NULL,
-    rename:     NULL,
-    link:      NULL,
-    chmod:     NULL,
-    chown:     NULL,
-    truncate:  NULL,
-    utime:     NULL,
-    open:      hello_open,
-    read:      hello_read,
-    write:     NULL,
-    statfs:    NULL,
-    release:   NULL,
-    fsync:     NULL
+    .getattr   = hello_getattr,
+    .getdir    = hello_getdir,
+    .open      = hello_open,
+    .read      = hello_read,
 };
 
 int main(int argc, char *argv[])

diff --git a/example/null.c b/example/null.c
index ca79dc4f10711d85e69a7993f5dcd7d0bf10ea6e..91f2cdac0b94ab26b1e2bf151b852bf26358241a 100644 (file)
--- a/example/null.c
+++ b/example/null.c
@@ -71,26 +71,12 @@ static int null_statfs(struct fuse_statfs *st)
 }
 
 static struct fuse_operations null_oper = {
-    getattr:   null_getattr,
-    readlink:  NULL,
-    getdir:     NULL,
-    mknod:     NULL,
-    mkdir:     NULL,
-    symlink:   NULL,
-    unlink:    NULL,
-    rmdir:     NULL,
-    rename:     NULL,
-    link:      NULL,
-    chmod:     NULL,
-    chown:     NULL,
-    truncate:  null_truncate,
-    utime:     NULL,
-    open:      null_open,
-    read:      null_read,
-    write:     null_write,
-    statfs:    null_statfs,
-    release:   NULL,
-    fsync:     NULL
+    .getattr   = null_getattr,
+    .truncate  = null_truncate,
+    .open      = null_open,
+    .read      = null_read,
+    .write     = null_write,
+    .statfs    = null_statfs,
 };
 
 int main(int argc, char *argv[])

diff --git a/kernel/.cvsignore b/kernel/.cvsignore
index bd5fe06963c75daecfa84bd5453e2c7d74e281e2..2852fde45dc55ca471cdd996f579675c2b33f412 100644 (file)
--- 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 8b9b3fbaa5b4c4f8bde822642862143b76eb0c27..dcc03b141232d9644e49c43811e27dd43afe6457 100644 (file)
--- 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 23d1f0153dd41b105e84596bb6e75c374f696732..7da5bc235bda05c52daadad367fbe8de687a029f 100644 (file)
--- 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 184f938af167472fe57e83b737e890fb108cf618..e8fe69667f8e45b202d66b34b28f022ffd5624e7 100644 (file)
--- 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 55d381c55b065612ca2bc02bd5f116b5d1ae784b..81a6fa89bda5e8e3c3d6b91b83edf42fd723f6e5 100644 (file)
--- 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);
 }