This commit was manufactured by cvs2svn to create branch 'vserver'.

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

diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index 4d4b5f4..1001a64 100644 (file)
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -80,7 +80,7 @@ static int init_inodecache(void)
 {
        smb_inode_cachep = kmem_cache_create("smb_inode_cache",
                                             sizeof(struct smb_inode_info),
-                                            0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
+                                            0, SLAB_RECLAIM_ACCOUNT,
                                             init_once, NULL);
        if (smb_inode_cachep == NULL)
                return -ENOMEM;
@@ -521,6 +521,7 @@ int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
        server->super_block = sb;
        server->mnt = NULL;
        server->sock_file = NULL;
+       init_waitqueue_head(&server->conn_wq);
        init_MUTEX(&server->sem);
        INIT_LIST_HEAD(&server->entry);
        INIT_LIST_HEAD(&server->xmitq);