aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2005-11-02 15:07:51 +1100
committerNathan Scott <nathans@sgi.com>2005-11-02 15:07:51 +1100
commit8a319ae49442eaedc7f932e9a520e464103f3ad0 (patch)
tree7ff0fd08904a12ad1428f33a98d603547c20963d
parent374e2ac33724d1dd432b6c75f9b1adf715c2add7 (diff)
[XFS] Disable attr2 by default, until a more appropriate time to enable
it. SGI-PV: 941645 SGI-Modid: xfs-linux:xfs-kern:24002a Signed-off-by: Nathan Scott <nathans@sgi.com>
-rw-r--r--fs/xfs/xfs_vfsops.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index d3c99ac64af..96f7cdebe1b 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -382,6 +382,10 @@ xfs_finish_flags(
return XFS_ERROR(EINVAL);
}
+ if (XFS_SB_VERSION_HASATTR2(&mp->m_sb)) {
+ mp->m_flags &= ~XFS_MOUNT_COMPAT_ATTR;
+ }
+
return 0;
}
@@ -1676,6 +1680,8 @@ xfs_parseargs(
int iosize;
args->flags |= XFSMNT_COMPAT_IOSIZE;
+ args->flags |= XFSMNT_COMPAT_ATTR;
+
#if 0 /* XXX: off by default, until some remaining issues ironed out */
args->flags |= XFSMNT_IDELETE; /* default to on */
#endif
@@ -1883,7 +1889,6 @@ xfs_showargs(
{ XFS_MOUNT_OSYNCISOSYNC, "," MNTOPT_OSYNCISOSYNC },
{ XFS_MOUNT_BARRIER, "," MNTOPT_BARRIER },
{ XFS_MOUNT_IDELETE, "," MNTOPT_NOIKEEP },
- { XFS_MOUNT_COMPAT_ATTR, "," MNTOPT_NOATTR2 },
{ 0, NULL }
};
struct proc_xfs_info *xfs_infop;
@@ -1924,6 +1929,9 @@ xfs_showargs(
if (!(mp->m_flags & XFS_MOUNT_32BITINOOPT))
seq_printf(m, "," MNTOPT_64BITINODE);
+ if (!(mp->m_flags & XFS_MOUNT_COMPAT_ATTR))
+ seq_printf(m, "," MNTOPT_ATTR2);
+
if (!(mp->m_flags & XFS_MOUNT_COMPAT_IOSIZE))
seq_printf(m, "," MNTOPT_LARGEIO);