Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Index: xfs-2.6.x/fs/xfs/linux-2.4/xfs_file.c
===================================================================
--- xfs-2.6.x.orig/fs/xfs/linux-2.4/xfs_file.c 2006-02-17 16:14:37.000000000
+0100
+++ xfs-2.6.x/fs/xfs/linux-2.4/xfs_file.c 2006-02-21 20:53:00.000000000
+0100
@@ -445,14 +445,9 @@
struct inode *inode)
{
vnode_t *vp = LINVFS_GET_VP(inode);
- xfs_mount_t *mp;
+ xfs_mount_t *mp = XFS_VFSTOM(vp->v_vfsp);
int error = 0;
xfs_inode_t *ip;
- bhv_desc_t *xbdp;
-
- if( (xbdp = bhv_lookup(VFS_BHVHEAD(vp->v_vfsp), &xfs_vfsops)) == NULL)
- return 0;
- mp = XFS_BHVTOM(xbdp);
if (vp->v_vfsp->vfs_flag & VFS_DMI) {
ip = xfs_vtoi(vp);
Index: xfs-2.6.x/fs/xfs/linux-2.4/xfs_vfs.c
===================================================================
--- xfs-2.6.x.orig/fs/xfs/linux-2.4/xfs_vfs.c 2006-02-17 16:14:37.000000000
+0100
+++ xfs-2.6.x/fs/xfs/linux-2.4/xfs_vfs.c 2006-02-21 20:53:25.000000000
+0100
@@ -314,7 +314,7 @@
bhv_remove_vfsops(vfsp, VFS_POSITION_IO);
if (!freebase)
return;
- mp = XFS_BHVTOM(bhv_lookup(VFS_BHVHEAD(vfsp), &xfs_vfsops));
+ mp = XFS_VFSTOM(vfsp);
VFS_REMOVEBHV(vfsp, &mp->m_bhv);
xfs_mount_free(mp, 0);
}
Index: xfs-2.6.x/fs/xfs/linux-2.6/xfs_vfs.c
===================================================================
--- xfs-2.6.x.orig/fs/xfs/linux-2.6/xfs_vfs.c 2006-02-17 16:14:37.000000000
+0100
+++ xfs-2.6.x/fs/xfs/linux-2.6/xfs_vfs.c 2006-02-21 20:53:00.000000000
+0100
@@ -405,7 +405,7 @@
bhv_remove_vfsops(vfsp, VFS_POSITION_IO);
if (!freebase)
return;
- mp = XFS_BHVTOM(bhv_lookup(VFS_BHVHEAD(vfsp), &xfs_vfsops));
+ mp = XFS_VFSTOM(vfsp);
VFS_REMOVEBHV(vfsp, &mp->m_bhv);
xfs_mount_free(mp, 0);
}
|