Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / fs / afs / super.c

diff --git a/fs/afs/super.c b/fs/afs/super.c
index bcf81d3..53c56e7 100644 (file)
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -78,9 +78,7 @@ int __init afs_fs_init(void)
 
        _enter("");
 
-#ifdef AFS_AUTOMOUNT_SUPPORT
        afs_timer_init(&afs_mntpt_expiry_timer, &afs_mntpt_expiry_timer_ops);
-#endif
 
        /* create ourselves an inode cache */
        atomic_set(&afs_count_active_inodes, 0);
@@ -172,7 +170,7 @@ static int afs_super_parse_options(struct afs_mount_params *params,
        options[PAGE_SIZE - 1] = 0;
 
        ret = 0;
-       while ((key = strsep(&options, ",")))
+       while ((key = strsep(&options, ",")) != 0)
        {
                value = strchr(key, '=');
                if (value)
@@ -343,7 +341,7 @@ static struct super_block *afs_get_sb(struct file_system_type *fs_type,
 
        sb->s_flags = flags;
 
-       ret = afs_fill_super(sb, &params, flags & MS_VERBOSE ? 1 : 0);
+       ret = afs_fill_super(sb, &params, flags & MS_SILENT ? 1 : 0);
        if (ret < 0) {
                up_write(&sb->s_umount);
                deactivate_super(sb);