From 79bfe84887170beffd984410fa36845fd717e4f1 Mon Sep 17 00:00:00 2001 From: Stephen Lord <lord@jen.americas.sgi.com> Date: Wed, 8 Oct 2003 04:28:31 -0500 Subject: [PATCH] Revert from using __kernel_fsid_t to fsid_t since ia64 now defines this correctly --- fs/xfs/linux/xfs_vfs.h | 4 ++-- fs/xfs/xfs_mount.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/xfs/linux/xfs_vfs.h b/fs/xfs/linux/xfs_vfs.h index 55e39bc9309a..d12501e7dac4 100644 --- a/fs/xfs/linux/xfs_vfs.h +++ b/fs/xfs/linux/xfs_vfs.h @@ -44,8 +44,8 @@ struct xfs_mount_args; typedef struct vfs { u_int vfs_flag; /* flags */ - __kernel_fsid_t vfs_fsid; /* file system ID */ - __kernel_fsid_t *vfs_altfsid; /* An ID fixed for life of FS */ + fsid_t vfs_fsid; /* file system ID */ + fsid_t *vfs_altfsid; /* An ID fixed for life of FS */ bhv_head_t vfs_bh; /* head of vfs behavior chain */ struct super_block *vfs_super; /* Linux superblock structure */ struct task_struct *vfs_sync_task; diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 5bb50ff4d172..d6fba8693d36 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -903,7 +903,7 @@ xfs_mountfs( * File systems that don't support user level file handles (i.e. * all of them except for XFS) will leave vfs_altfsid as NULL. */ - vfsp->vfs_altfsid = (__kernel_fsid_t *)mp->m_fixedfsid; + vfsp->vfs_altfsid = (fsid_t *)mp->m_fixedfsid; mp->m_dmevmask = 0; /* not persistent; set after each mount */ /* -- 2.30.9