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: Thiago Farina <tfarina@chromium.org>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 46bd9d52ab518a57f4ef697d45b310060f0f6d10..dafdae36f2fb3a2d73585e04adee5e7b8e2c3b68 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -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 -

diff --git a/fs/xfs/xfs_qm_bhv.c b/fs/xfs/xfs_qm_bhv.c
index 6b39115bf14563b39bada4ed5084fffa22a9262d..2d02eac1c9a8e203886b01c5b67657dae397ce0d 100644 (file)
--- a/fs/xfs/xfs_qm_bhv.c
+++ b/fs/xfs/xfs_qm_bhv.c
@@ -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;
                }

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 8a59f8546552e9577b3a93c44b8cfb7251e3561a..33d9c2b6f5555e83d2ae55742c3924dda814ec50 100644 (file)
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -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;

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 0c7fa54f309e1da36012a924905e5226f147f4c4..642c2d6e1db163b47e7368013754ffec46811e37 100644 (file)
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -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;

diff --git a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h
index 7a41874f4c209b7a405486ce123be374efa9c148..61ba1cfa974c7e3e32c493c1317236e2cb397730 100644 (file)
--- a/fs/xfs/xfs_types.h
+++ b/fs/xfs/xfs_types.h
@@ -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 */
 

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index d95f565a390e8bc006b708b734b6107620a8d0aa..77ad74834baacade243e5db0675addc373a0a84c 100644 (file)
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -725,7 +725,7 @@ xfs_create(
        int                     error;
        xfs_bmap_free_t         free_list;
        xfs_fsblock_t           first_block;
-       boolean_t               unlock_dp_on_error = B_FALSE;
+       bool                    unlock_dp_on_error = false;
        uint                    cancel_flags;
        int                     committed;
        prid_t                  prid;
@@ -794,7 +794,7 @@ xfs_create(
        }
 
        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);
 
@@ -830,7 +830,7 @@ xfs_create(
         * error path.
         */
        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,
                                        &first_block, &free_list, resblks ?
@@ -1367,7 +1367,7 @@ xfs_symlink(
        int                     pathlen;
        xfs_bmap_free_t         free_list;
        xfs_fsblock_t           first_block;
-       boolean_t               unlock_dp_on_error = B_FALSE;
+       bool                    unlock_dp_on_error = false;
        uint                    cancel_flags;
        int                     committed;
        xfs_fileoff_t           first_fsb;
@@ -1438,7 +1438,7 @@ xfs_symlink(
        }
 
        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.
@@ -1484,7 +1484,7 @@ xfs_symlink(
         * error path.
         */
        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.