linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / xfs / linux-2.6 / xfs_vfs.c

diff --git a/fs/xfs/linux-2.6/xfs_vfs.c b/fs/xfs/linux-2.6/xfs_vfs.c
index 6f7c9f7..c855d62 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_vfs.c
+++ b/fs/xfs/linux-2.6/xfs_vfs.c
@@ -227,8 +227,7 @@ vfs_freeze(
 }
 
 vfs_t *
-vfs_allocate(
-       struct super_block      *sb)
+vfs_allocate( void )
 {
        struct vfs              *vfsp;
 
@@ -237,23 +236,9 @@ vfs_allocate(
        INIT_LIST_HEAD(&vfsp->vfs_sync_list);
        spin_lock_init(&vfsp->vfs_sync_lock);
        init_waitqueue_head(&vfsp->vfs_wait_single_sync_task);
-
-       vfsp->vfs_super = sb;
-       sb->s_fs_info = vfsp;
-
-       if (sb->s_flags & MS_RDONLY)
-               vfsp->vfs_flag |= VFS_RDONLY;
-
        return vfsp;
 }
 
-vfs_t *
-vfs_from_sb(
-       struct super_block      *sb)
-{
-       return (vfs_t *)sb->s_fs_info;
-}
-
 void
 vfs_deallocate(
        struct vfs              *vfsp)
@@ -310,7 +295,7 @@ bhv_remove_all_vfsops(
        bhv_remove_vfsops(vfsp, VFS_POSITION_DM);
        if (!freebase)
                return;
-       mp = XFS_VFSTOM(vfsp);
+       mp = XFS_BHVTOM(bhv_lookup(VFS_BHVHEAD(vfsp), &xfs_vfsops));
        VFS_REMOVEBHV(vfsp, &mp->m_bhv);
        xfs_mount_free(mp, 0);
 }