summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-01-11 15:28:45 +1100
committerNathan Scott <nathans@sgi.com>2006-01-11 15:28:45 +1100
commit70a061f1fdbfa4805233a113868d059e9614731a (patch)
treea69839c15152b4614ab34e8eed96b068d1b36b7a
parentdd9f438e32900d67def49fa1b8961b3e19b6fefc (diff)
downloadkernel-crypto-70a061f1fdbfa4805233a113868d059e9614731a.tar.gz
kernel-crypto-70a061f1fdbfa4805233a113868d059e9614731a.tar.xz
kernel-crypto-70a061f1fdbfa4805233a113868d059e9614731a.zip
[XFS] Fix typo from when enabling write barriers by default, flags botch
in showargs. SGI-PV: 912426 SGI-Modid: xfs-linux-melb:xfs-kern:24383a Signed-off-by: Nathan Scott <nathans@sgi.com>
-rw-r--r--fs/xfs/xfs_vfsops.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 3406399e25b..e344906bdcb 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -1924,36 +1924,30 @@ xfs_showargs(
if (mp->m_logbufs > 0)
seq_printf(m, "," MNTOPT_LOGBUFS "=%d", mp->m_logbufs);
-
if (mp->m_logbsize > 0)
seq_printf(m, "," MNTOPT_LOGBSIZE "=%dk", mp->m_logbsize >> 10);
if (mp->m_logname)
seq_printf(m, "," MNTOPT_LOGDEV "=%s", mp->m_logname);
-
if (mp->m_rtname)
seq_printf(m, "," MNTOPT_RTDEV "=%s", mp->m_rtname);
if (mp->m_dalign > 0)
seq_printf(m, "," MNTOPT_SUNIT "=%d",
(int)XFS_FSB_TO_BB(mp, mp->m_dalign));
-
if (mp->m_swidth > 0)
seq_printf(m, "," MNTOPT_SWIDTH "=%d",
(int)XFS_FSB_TO_BB(mp, mp->m_swidth));
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);
+ if (!(mp->m_flags & XFS_MOUNT_BARRIER))
+ seq_printf(m, "," MNTOPT_NOBARRIER);
if (!(vfsp->vfs_flag & VFS_32BITINODES))
seq_printf(m, "," MNTOPT_64BITINODE);
-
- if (!(vfsp->vfs_flag & XFS_MOUNT_BARRIER))
- seq_printf(m, "," MNTOPT_NOBARRIER);
-
if (vfsp->vfs_flag & VFS_GRPID)
seq_printf(m, "," MNTOPT_GRPID);