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

Commit cc92e7ac authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tim Shimmin
Browse files

[XFS] growlock should be a mutex 



m_growlock only needs plain binary mutex semantics, so use a struct mutex
instead of a semaphore for it.

SGI-PV: 968563
SGI-Modid: xfs-linux-melb:xfs-kern:29512a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 0adba536

fs/xfs/xfs_fsops.c

+4 −4
Original line number Diff line number Diff line
@@ -433,10 +433,10 @@ xfs_growfs_data( 
	xfs_growfs_data_t	*in)

{

	int error;

	if (!cpsema(&mp->m_growlock))

	if (!mutex_trylock(&mp->m_growlock))

		return XFS_ERROR(EWOULDBLOCK);

	error = xfs_growfs_data_private(mp, in);

	vsema(&mp->m_growlock);

	mutex_unlock(&mp->m_growlock);

	return error;

}
@@ -446,10 +446,10 @@ xfs_growfs_log( 
	xfs_growfs_log_t	*in)

{

	int error;

	if (!cpsema(&mp->m_growlock))

	if (!mutex_trylock(&mp->m_growlock))

		return XFS_ERROR(EWOULDBLOCK);

	error = xfs_growfs_log_private(mp, in);

	vsema(&mp->m_growlock);

	mutex_unlock(&mp->m_growlock);

	return error;

}

fs/xfs/xfs_mount.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ xfs_mount_init(void) 
	AIL_LOCKINIT(&mp->m_ail_lock, "xfs_ail");

	spinlock_init(&mp->m_sb_lock, "xfs_sb");

	mutex_init(&mp->m_ilock);

	initnsema(&mp->m_growlock, 1, "xfs_grow");

	mutex_init(&mp->m_growlock);

	/*

	 * Initialize the AIL.

	 */
@@ -174,7 +174,7 @@ xfs_mount_free( 
	AIL_LOCK_DESTROY(&mp->m_ail_lock);

	spinlock_destroy(&mp->m_sb_lock);

	mutex_destroy(&mp->m_ilock);

	freesema(&mp->m_growlock);

	mutex_destroy(&mp->m_growlock);

	if (mp->m_quotainfo)

		XFS_QM_DONE(mp);

fs/xfs/xfs_mount.h

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ typedef struct xfs_mount { 
	uint			m_in_maxlevels;	/* XFS_IN_MAXLEVELS */

	struct xfs_perag	*m_perag;	/* per-ag accounting info */

	struct rw_semaphore	m_peraglock;	/* lock for m_perag (pointer) */

	sema_t			m_growlock;	/* growfs mutex */

	struct mutex		m_growlock;	/* growfs mutex */

	int			m_fixedfsid[2];	/* unchanged for life of FS */

	uint			m_dmevmask;	/* DMI events for this FS */

	__uint64_t		m_flags;	/* global mount flags */