vserver 1.9.5.x5

[linux-2.6.git] / fs / coda / inode.c

diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index 7345de4..04a73fb 100644 (file)
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -69,7 +69,7 @@ int coda_init_inodecache(void)
 {
        coda_inode_cachep = kmem_cache_create("coda_inode_cache",
                                sizeof(struct coda_inode_info),
-                               0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
+                               0, SLAB_RECLAIM_ACCOUNT,
                                init_once, NULL);
        if (coda_inode_cachep == NULL)
                return -ENOMEM;
@@ -89,7 +89,7 @@ static int coda_remount(struct super_block *sb, int *flags, char *data)
 }
 
 /* exported operations */
-struct super_operations coda_super_operations =
+static struct super_operations coda_super_operations =
 {
        .alloc_inode    = coda_alloc_inode,
        .destroy_inode  = coda_destroy_inode,
@@ -142,7 +142,7 @@ static int get_device_index(struct coda_mount_data *data)
 
 static int coda_fill_super(struct super_block *sb, void *data, int silent)
 {
-        struct inode *root = 0; 
+        struct inode *root = NULL; 
        struct coda_sb_info *sbi = NULL;
        struct venus_comm *vc = NULL;
        struct CodaFid fid;
@@ -253,7 +253,7 @@ int coda_setattr(struct dentry *de, struct iattr *iattr)
        
        memset(&vattr, 0, sizeof(vattr)); 
 
-       inode->i_ctime = CURRENT_TIME;
+       inode->i_ctime = CURRENT_TIME_SEC;
        coda_iattr_to_vattr(iattr, &vattr);
        vattr.va_type = C_VNON; /* cannot set type */