X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fxfs%2Flinux-2.6%2Fxfs_vfs.c;h=c855d62e53440323998bfafe1a7de416431a8a1e;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=6f7c9f7a86246ee1f3e822b5e706417718f77406;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/fs/xfs/linux-2.6/xfs_vfs.c b/fs/xfs/linux-2.6/xfs_vfs.c
index 6f7c9f7a8..c855d62e5 100644
--- 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);
 }