summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorNathan Scott2006-01-11 05:35:32 +0100
committerNathan Scott2006-01-11 05:35:32 +0100
commitc2cd2550603d847b709035c4c6b666adf560d7b8 (patch)
tree98c481f98dd3cef56e2f07dbc20079396a471ca4 /fs/xfs
parent[XFS] fix, speedup and simplify atime handling let the VFS handle atime (diff)
downloadkernel-qcow2-linux-c2cd2550603d847b709035c4c6b666adf560d7b8.tar.gz
kernel-qcow2-linux-c2cd2550603d847b709035c4c6b666adf560d7b8.tar.xz
kernel-qcow2-linux-c2cd2550603d847b709035c4c6b666adf560d7b8.zip
[XFS] Fix v2 log bufsize reporting in /proc/mounts.
SGI-PV: 946760 SGI-Modid: xfs-linux-melb:xfs-kern:24765a Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_vfsops.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index f22bebf8f513..b6ad370fab3d 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -333,10 +333,11 @@ xfs_finish_flags(
/* Fail a mount where the logbuf is smaller then the log stripe */
if (XFS_SB_VERSION_HASLOGV2(&mp->m_sb)) {
- if ((ap->logbufsize == -1) &&
+ if ((ap->logbufsize <= 0) &&
(mp->m_sb.sb_logsunit > XLOG_BIG_RECORD_BSIZE)) {
mp->m_logbsize = mp->m_sb.sb_logsunit;
- } else if (ap->logbufsize < mp->m_sb.sb_logsunit) {
+ } else if (ap->logbufsize > 0 &&
+ ap->logbufsize < mp->m_sb.sb_logsunit) {
cmn_err(CE_WARN,
"XFS: logbuf size must be greater than or equal to log stripe size");
return XFS_ERROR(EINVAL);