Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2cd2550 authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Fix v2 log bufsize reporting in /proc/mounts. 



SGI-PV: 946760
SGI-Modid: xfs-linux-melb:xfs-kern:24765a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 42fe2b1f

fs/xfs/xfs_vfsops.c

+3 −2
Original line number Diff line number Diff line
@@ -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);