Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index 4888c1f..1e52be6 100644 (file)
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -27,7 +27,7 @@ static void autofs_put_super(struct super_block *sb)
        if ( !sbi->catatonic )
                autofs_catatonic_mode(sbi); /* Free wait queues, close pipe */
 
-       autofs_hash_nuke(&sbi->dirhash);
+       autofs_hash_nuke(sbi);
        for ( n = 0 ; n < AUTOFS_MAX_SYMLINKS ; n++ ) {
                if ( test_bit(n, sbi->symlink_bitmap) )
                        kfree(sbi->symlink[n].data);
@@ -148,6 +148,7 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
        s->s_magic = AUTOFS_SUPER_MAGIC;
        s->s_op = &autofs_sops;
        s->s_time_gran = 1;
+       sbi->sb = s;
 
        root_inode = iget(s, AUTOFS_ROOT_INO);
        root = d_alloc_root(root_inode);
@@ -215,7 +216,6 @@ static void autofs_read_inode(struct inode *inode)
        inode->i_nlink = 2;
        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
        inode->i_blocks = 0;
-       inode->i_blksize = 1024;
 
        if ( ino == AUTOFS_ROOT_INO ) {
                inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
@@ -240,7 +240,7 @@ static void autofs_read_inode(struct inode *inode)
                
                inode->i_op = &autofs_symlink_inode_operations;
                sl = &sbi->symlink[n];
-               inode->u.generic_ip = sl;
+               inode->i_private = sl;
                inode->i_mode = S_IFLNK | S_IRWXUGO;
                inode->i_mtime.tv_sec = inode->i_ctime.tv_sec = sl->mtime;
                inode->i_mtime.tv_nsec = inode->i_ctime.tv_nsec = 0;