Skip to content

L
linux
Commit 79bfe848 authored by Stephen Lord's avatar Stephen Lord Committed by Stephen Lord
Browse files
Options

Revert from using __kernel_fsid_t to fsid_t since ia64 now defines 

this correctly
parent 8db83635
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
fs/xfs/linux/xfs_vfs.h
View file @ 79bfe848
...@@ -44,8 +44,8 @@ struct xfs_mount_args; ...@@ -44,8 +44,8 @@ struct xfs_mount_args;
typedef struct vfs { typedef struct vfs {
u_int vfs_flag; /* flags */ u_int vfs_flag; /* flags */
__kernel_fsid_t vfs_fsid; /* file system ID */ fsid_t vfs_fsid; /* file system ID */
__kernel_fsid_t *vfs_altfsid; /* An ID fixed for life of FS */ fsid_t *vfs_altfsid; /* An ID fixed for life of FS */
bhv_head_t vfs_bh; /* head of vfs behavior chain */ bhv_head_t vfs_bh; /* head of vfs behavior chain */
struct super_block *vfs_super; /* Linux superblock structure */ struct super_block *vfs_super; /* Linux superblock structure */
struct task_struct *vfs_sync_task; struct task_struct *vfs_sync_task;
......
fs/xfs/xfs_mount.c
View file @ 79bfe848
...@@ -903,7 +903,7 @@ xfs_mountfs( ...@@ -903,7 +903,7 @@ xfs_mountfs(
* File systems that don't support user level file handles (i.e. * File systems that don't support user level file handles (i.e.
* all of them except for XFS) will leave vfs_altfsid as NULL. * 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 */ mp->m_dmevmask = 0; /* not persistent; set after each mount */
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7