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

Commit 667a9291 authored by Thiago Farina's avatar Thiago Farina Committed by Ben Myers
Browse files

xfs: Remove boolean_t typedef completely. 



Since we are using C99 we have one builtin defined in include/linux/types.h,
use that instead.

v2: you missed one in fs/xfs/xfs_qm_bhv.c, cleaned up. -bpm

Signed-off-by: default avatarThiago Farina <tfarina@chromium.org>
Reviewed-by: default avatarBen Myers <bpm@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent aeb4f20a

fs/xfs/xfs_log.c

+4 −4
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ xlog_verify_iclog( 
	struct xlog		*log,

	struct xlog_in_core	*iclog,

	int			count,

	boolean_t		syncing);

	bool                    syncing);

STATIC void

xlog_verify_tail_lsn(

	struct xlog		*log,
@@ -3611,7 +3611,7 @@ xlog_verify_iclog( 
	struct xlog		*log,

	struct xlog_in_core	*iclog,

	int			count,

	boolean_t		syncing)

	bool                    syncing)

{

	xlog_op_header_t	*ophead;

	xlog_in_core_t		*icptr;
@@ -3659,7 +3659,7 @@ xlog_verify_iclog( 
		/* clientid is only 1 byte */

		field_offset = (__psint_t)

			       ((xfs_caddr_t)&(ophead->oh_clientid) - base_ptr);

		if (syncing == B_FALSE || (field_offset & 0x1ff)) {

		if (!syncing || (field_offset & 0x1ff)) {

			clientid = ophead->oh_clientid;

		} else {

			idx = BTOBBT((xfs_caddr_t)&(ophead->oh_clientid) - iclog->ic_datap);
@@ -3682,7 +3682,7 @@ xlog_verify_iclog( 
		/* check length */

		field_offset = (__psint_t)

			       ((xfs_caddr_t)&(ophead->oh_len) - base_ptr);

		if (syncing == B_FALSE || (field_offset & 0x1ff)) {

		if (!syncing || (field_offset & 0x1ff)) {

			op_len = be32_to_cpu(ophead->oh_len);

		} else {

			idx = BTOBBT((__psint_t)&ophead->oh_len -

fs/xfs/xfs_qm_bhv.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ xfs_qm_newmount( 
			 * inode goes inactive and wants to free blocks,

			 * or via xfs_log_mount_finish.

			 */

			*needquotamount = B_TRUE;

			*needquotamount = true;

			*quotaflags = mp->m_qflags;

			mp->m_qflags = 0;

		}

fs/xfs/xfs_qm_syscalls.c

+4 −4
Original line number Diff line number Diff line
@@ -408,10 +408,10 @@ xfs_qm_scall_getqstat( 
{

	struct xfs_quotainfo	*q = mp->m_quotainfo;

	struct xfs_inode	*uip, *gip;

	boolean_t		tempuqip, tempgqip;

	bool                    tempuqip, tempgqip;



	uip = gip = NULL;

	tempuqip = tempgqip = B_FALSE;

	tempuqip = tempgqip = false;

	memset(out, 0, sizeof(fs_quota_stat_t));



	out->qs_version = FS_QSTAT_VERSION;
@@ -434,12 +434,12 @@ xfs_qm_scall_getqstat( 
	if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) {

		if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,

					0, 0, &uip) == 0)

			tempuqip = B_TRUE;

			tempuqip = true;

	}

	if (!gip && mp->m_sb.sb_gquotino != NULLFSINO) {

		if (xfs_iget(mp, NULL, mp->m_sb.sb_gquotino,

					0, 0, &gip) == 0)

			tempgqip = B_TRUE;

			tempgqip = true;

	}

	if (uip) {

		out->qs_uquota.qfs_nblks = uip->i_d.di_nblocks;

fs/xfs/xfs_trans_dquot.c

+5 −5
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ xfs_trans_unreserve_and_mod_dquots( 
	int			i, j;

	xfs_dquot_t		*dqp;

	xfs_dqtrx_t		*qtrx, *qa;

	boolean_t		locked;

	bool                    locked;



	if (!tp->t_dqinfo || !(tp->t_flags & XFS_TRANS_DQ_DIRTY))

		return;
@@ -537,17 +537,17 @@ xfs_trans_unreserve_and_mod_dquots( 
			 * about the number of blocks used field, or deltas.

			 * Also we don't bother to zero the fields.

			 */

			locked = B_FALSE;

			locked = false;

			if (qtrx->qt_blk_res) {

				xfs_dqlock(dqp);

				locked = B_TRUE;

				locked = true;

				dqp->q_res_bcount -=

					(xfs_qcnt_t)qtrx->qt_blk_res;

			}

			if (qtrx->qt_ino_res) {

				if (!locked) {

					xfs_dqlock(dqp);

					locked = B_TRUE;

					locked = true;

				}

				dqp->q_res_icount -=

					(xfs_qcnt_t)qtrx->qt_ino_res;
@@ -556,7 +556,7 @@ xfs_trans_unreserve_and_mod_dquots( 
			if (qtrx->qt_rtblk_res) {

				if (!locked) {

					xfs_dqlock(dqp);

					locked = B_TRUE;

					locked = true;

				}

				dqp->q_res_rtbcount -=

					(xfs_qcnt_t)qtrx->qt_rtblk_res;

fs/xfs/xfs_types.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ typedef unsigned int __uint32_t; 
typedef signed long long int	__int64_t;

typedef unsigned long long int	__uint64_t;



typedef enum { B_FALSE,B_TRUE }	boolean_t;

typedef __uint32_t		prid_t;		/* project ID */

typedef __uint32_t		inst_t;		/* an instruction */