upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index f1e2141..4765aaa 100644 (file)
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -493,7 +493,7 @@ smb_put_super(struct super_block *sb)
        smb_kfree(server);
 }
 
-int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
+static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
 {
        struct smb_sb_info *server;
        struct smb_mount_data_kernel *mnt;
@@ -516,6 +516,7 @@ int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
        sb->s_blocksize_bits = 10;
        sb->s_magic = SMB_SUPER_MAGIC;
        sb->s_op = &smb_sops;
+       sb->s_time_gran = 100;
 
        server = smb_kmalloc(sizeof(struct smb_sb_info), GFP_KERNEL);
        if (!server)
@@ -601,7 +602,7 @@ int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
        /*
         * Keep the super block locked while we get the root inode.
         */
-       smb_init_root_dirent(server, &root);
+       smb_init_root_dirent(server, &root, sb);
        root_inode = smb_iget(sb, &root);
        if (!root_inode)
                goto out_no_root;