mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-13 01:52:44 +00:00
[XFS] Resolve a namespace collision on vfs/vfsops for FreeBSD porters.
SGI-PV: 9533338 SGI-Modid: xfs-linux-melb:xfs-kern:26106a Signed-off-by: Nathan Scott <nathans@sgi.com>
This commit is contained in:
parent
932f2c3231
commit
b83bd13881
19 changed files with 183 additions and 224 deletions
|
@ -498,9 +498,8 @@ xfs_log_mount(xfs_mount_t *mp,
|
|||
* just worked.
|
||||
*/
|
||||
if (!(mp->m_flags & XFS_MOUNT_NORECOVERY)) {
|
||||
int error;
|
||||
vfs_t *vfsp = XFS_MTOVFS(mp);
|
||||
int readonly = (vfsp->vfs_flag & VFS_RDONLY);
|
||||
bhv_vfs_t *vfsp = XFS_MTOVFS(mp);
|
||||
int error, readonly = (vfsp->vfs_flag & VFS_RDONLY);
|
||||
|
||||
if (readonly)
|
||||
vfsp->vfs_flag &= ~VFS_RDONLY;
|
||||
|
@ -816,7 +815,7 @@ xfs_log_need_covered(xfs_mount_t *mp)
|
|||
SPLDECL(s);
|
||||
int needed = 0, gen;
|
||||
xlog_t *log = mp->m_log;
|
||||
vfs_t *vfsp = XFS_MTOVFS(mp);
|
||||
bhv_vfs_t *vfsp = XFS_MTOVFS(mp);
|
||||
|
||||
if (fs_frozen(vfsp) || XFS_FORCED_SHUTDOWN(mp) ||
|
||||
(vfsp->vfs_flag & VFS_RDONLY))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue