mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfs: Remove boolean_t typedef completely.

Browse source 
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: Thiago Farina <tfarina@chromium.org>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
Thiago Farina 2012-11-12 21:32:59 -02:00 committed by Ben Myers
parent aeb4f20a02
commit 667a9291c5
6 changed files with 20 additions and 21 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
fs/xfs/xfs_log.c
View file

@ -120,7 +120,7 @@ xlog_verify_iclog(
struct xlog *log, struct xlog *log,
struct xlog_in_core *iclog, struct xlog_in_core *iclog,
int count, int count,
boolean_t syncing); bool syncing);
STATIC void STATIC void
xlog_verify_tail_lsn( xlog_verify_tail_lsn(
struct xlog *log, struct xlog *log,
@ -3611,7 +3611,7 @@ xlog_verify_iclog(
struct xlog *log, struct xlog *log,
struct xlog_in_core *iclog, struct xlog_in_core *iclog,
int count, int count,
boolean_t syncing) bool syncing)
{ {
xlog_op_header_t *ophead; xlog_op_header_t *ophead;
xlog_in_core_t *icptr; xlog_in_core_t *icptr;
@ -3659,7 +3659,7 @@ xlog_verify_iclog(
/* clientid is only 1 byte */ /* clientid is only 1 byte */
field_offset = (__psint_t) field_offset = (__psint_t)
((xfs_caddr_t)&(ophead->oh_clientid) - base_ptr); ((xfs_caddr_t)&(ophead->oh_clientid) - base_ptr);
if (syncing == B_FALSE || (field_offset & 0x1ff)) { if (!syncing || (field_offset & 0x1ff)) {
clientid = ophead->oh_clientid; clientid = ophead->oh_clientid;
} else { } else {
idx = BTOBBT((xfs_caddr_t)&(ophead->oh_clientid) - iclog->ic_datap); idx = BTOBBT((xfs_caddr_t)&(ophead->oh_clientid) - iclog->ic_datap);
@ -3682,7 +3682,7 @@ xlog_verify_iclog(
/* check length */ /* check length */
field_offset = (__psint_t) field_offset = (__psint_t)
((xfs_caddr_t)&(ophead->oh_len) - base_ptr); ((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); op_len = be32_to_cpu(ophead->oh_len);
} else { } else {
idx = BTOBBT((__psint_t)&ophead->oh_len - idx = BTOBBT((__psint_t)&ophead->oh_len -

2
fs/xfs/xfs_qm_bhv.c
View file

@ -146,7 +146,7 @@ xfs_qm_newmount(
* inode goes inactive and wants to free blocks, * inode goes inactive and wants to free blocks,
* or via xfs_log_mount_finish. * or via xfs_log_mount_finish.
*/ */
*needquotamount = B_TRUE; *needquotamount = true;
*quotaflags = mp->m_qflags; *quotaflags = mp->m_qflags;
mp->m_qflags = 0; mp->m_qflags = 0;
} }

8
fs/xfs/xfs_qm_syscalls.c
View file

@ -408,10 +408,10 @@ xfs_qm_scall_getqstat(
{ {
struct xfs_quotainfo *q = mp->m_quotainfo; struct xfs_quotainfo *q = mp->m_quotainfo;
struct xfs_inode *uip, *gip; struct xfs_inode *uip, *gip;
boolean_t tempuqip, tempgqip; bool tempuqip, tempgqip;
uip = gip = NULL; uip = gip = NULL;
tempuqip = tempgqip = B_FALSE; tempuqip = tempgqip = false;
memset(out, 0, sizeof(fs_quota_stat_t)); memset(out, 0, sizeof(fs_quota_stat_t));
out->qs_version = FS_QSTAT_VERSION; out->qs_version = FS_QSTAT_VERSION;
@ -434,12 +434,12 @@ xfs_qm_scall_getqstat(
if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) { if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) {
if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino, if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,
0, 0, &uip) == 0) 0, 0, &uip) == 0)
tempuqip = B_TRUE; tempuqip = true;
} }
if (!gip && mp->m_sb.sb_gquotino != NULLFSINO) { if (!gip && mp->m_sb.sb_gquotino != NULLFSINO) {
if (xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, if (xfs_iget(mp, NULL, mp->m_sb.sb_gquotino,
0, 0, &gip) == 0) 0, 0, &gip) == 0)
tempgqip = B_TRUE; tempgqip = true;
} }
if (uip) { if (uip) {
out->qs_uquota.qfs_nblks = uip->i_d.di_nblocks; out->qs_uquota.qfs_nblks = uip->i_d.di_nblocks;

10
fs/xfs/xfs_trans_dquot.c
View file

@ -516,7 +516,7 @@ xfs_trans_unreserve_and_mod_dquots(
int i, j; int i, j;
xfs_dquot_t *dqp; xfs_dquot_t *dqp;
xfs_dqtrx_t *qtrx, *qa; xfs_dqtrx_t *qtrx, *qa;
boolean_t locked; bool locked;
if (!tp->t_dqinfo || !(tp->t_flags & XFS_TRANS_DQ_DIRTY)) if (!tp->t_dqinfo || !(tp->t_flags & XFS_TRANS_DQ_DIRTY))
return; return;
@ -537,17 +537,17 @@ xfs_trans_unreserve_and_mod_dquots(
* about the number of blocks used field, or deltas. * about the number of blocks used field, or deltas.
* Also we don't bother to zero the fields. * Also we don't bother to zero the fields.
*/ */
locked = B_FALSE; locked = false;
if (qtrx->qt_blk_res) { if (qtrx->qt_blk_res) {
xfs_dqlock(dqp); xfs_dqlock(dqp);
locked = B_TRUE; locked = true;
dqp->q_res_bcount -= dqp->q_res_bcount -=
(xfs_qcnt_t)qtrx->qt_blk_res; (xfs_qcnt_t)qtrx->qt_blk_res;
} }
if (qtrx->qt_ino_res) { if (qtrx->qt_ino_res) {
if (!locked) { if (!locked) {
xfs_dqlock(dqp); xfs_dqlock(dqp);
locked = B_TRUE; locked = true;
} }
dqp->q_res_icount -= dqp->q_res_icount -=
(xfs_qcnt_t)qtrx->qt_ino_res; (xfs_qcnt_t)qtrx->qt_ino_res;
@ -556,7 +556,7 @@ xfs_trans_unreserve_and_mod_dquots(
if (qtrx->qt_rtblk_res) { if (qtrx->qt_rtblk_res) {
if (!locked) { if (!locked) {
xfs_dqlock(dqp); xfs_dqlock(dqp);
locked = B_TRUE; locked = true;
} }
dqp->q_res_rtbcount -= dqp->q_res_rtbcount -=
(xfs_qcnt_t)qtrx->qt_rtblk_res; (xfs_qcnt_t)qtrx->qt_rtblk_res;

1
fs/xfs/xfs_types.h
View file

@ -32,7 +32,6 @@ typedef unsigned int __uint32_t;
typedef signed long long int __int64_t; typedef signed long long int __int64_t;
typedef unsigned long long int __uint64_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 prid_t; /* project ID */
typedef __uint32_t inst_t; /* an instruction */ typedef __uint32_t inst_t; /* an instruction */

12
fs/xfs/xfs_vnodeops.c
View file

@ -725,7 +725,7 @@ xfs_create(
int error; int error;
xfs_bmap_free_t free_list; xfs_bmap_free_t free_list;
xfs_fsblock_t first_block; xfs_fsblock_t first_block;
boolean_t unlock_dp_on_error = B_FALSE; bool unlock_dp_on_error = false;
uint cancel_flags; uint cancel_flags;
int committed; int committed;
prid_t prid; prid_t prid;
@ -794,7 +794,7 @@ xfs_create(
} }
xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT);
unlock_dp_on_error = B_TRUE; unlock_dp_on_error = true;
xfs_bmap_init(&free_list, &first_block); xfs_bmap_init(&free_list, &first_block);
@ -830,7 +830,7 @@ xfs_create(
* error path. * error path.
*/ */
xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
unlock_dp_on_error = B_FALSE; unlock_dp_on_error = false;
error = xfs_dir_createname(tp, dp, name, ip->i_ino, error = xfs_dir_createname(tp, dp, name, ip->i_ino,
&first_block, &free_list, resblks ? &first_block, &free_list, resblks ?
@ -1367,7 +1367,7 @@ xfs_symlink(
int pathlen; int pathlen;
xfs_bmap_free_t free_list; xfs_bmap_free_t free_list;
xfs_fsblock_t first_block; xfs_fsblock_t first_block;
boolean_t unlock_dp_on_error = B_FALSE; bool unlock_dp_on_error = false;
uint cancel_flags; uint cancel_flags;
int committed; int committed;
xfs_fileoff_t first_fsb; xfs_fileoff_t first_fsb;
@ -1438,7 +1438,7 @@ xfs_symlink(
} }
xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT);
unlock_dp_on_error = B_TRUE; unlock_dp_on_error = true;
/* /*
* Check whether the directory allows new symlinks or not. * Check whether the directory allows new symlinks or not.
@ -1484,7 +1484,7 @@ xfs_symlink(
* error path. * error path.
*/ */
xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
unlock_dp_on_error = B_FALSE; unlock_dp_on_error = false;
/* /*
* Also attach the dquot(s) to it, if applicable. * Also attach the dquot(s) to it, if applicable.