* xfs: Remove boolean_t typedef completely.
@ 2012-11-13 0:36 Thiago Farina
2012-11-13 1:53 ` Dave Chinner
0 siblings, 1 reply; 4+ messages in thread
From: Thiago Farina @ 2012-11-13 0:36 UTC (permalink / raw)
To: Dave Chinner; +Cc: linux list, Ben Myers, Alex Elder, xfs
[-- Attachment #1: Type: text/plain, Size: 718 bytes --]
On Mon, Nov 12, 2012 at 10:24 PM, Dave Chinner <david@fromorbit.com> wrote:
> On Mon, Nov 12, 2012 at 09:36:17PM -0200, Thiago Farina wrote:
>> Hi,
>>
>> Please, take a look.
>>
>> Patch attached.
>
> It's a good start for a cleanup, but there's no point in removing
> the boolean_t from one file and then not removing it from the rest
> of the XFS code. It's only used in a handful of places, so just
> remove it completely.
>
Done.
Please, take another look.
> Also, can you please place patches in line rather than attaching
> them. Attaching them means they cannot be quoted in reply. See
> Documentation/SubmittingPatches and Documentation/email-clients.txt
> for guidelines.
>
Sorry, patch attached.
Thanks,
[-- Attachment #2: 0001-xfs-Remove-boolean_t-typedef-completely.patch --]
[-- Type: application/octet-stream, Size: 6121 bytes --]
From 3852af0ff8d684dc04943cfb7b286964dc830640 Mon Sep 17 00:00:00 2001
From: Thiago Farina <tfarina@chromium.org>
Date: Mon, 12 Nov 2012 21:32:59 -0200
Subject: [PATCH] xfs: Remove boolean_t typedef completely.
Since we are using C99 we have one builtin defined in include/linux/types.h,
use that instead.
Signed-off-by: Thiago Farina <tfarina@chromium.org>
---
fs/xfs/xfs_log.c | 8 ++++----
fs/xfs/xfs_qm_syscalls.c | 8 ++++----
fs/xfs/xfs_trans_dquot.c | 10 +++++-----
fs/xfs/xfs_types.h | 1 -
fs/xfs/xfs_vnodeops.c | 12 ++++++------
5 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 4dad756..4e7eb76 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -118,7 +118,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,
@@ -3451,7 +3451,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;
@@ -3499,7 +3499,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);
@@ -3522,7 +3522,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_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 858a3b1..07b1156 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -407,10 +407,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;
@@ -433,12 +433,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 0c7fa54..642c2d6 100644
--- 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 7a41874..61ba1cf 100644
--- 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 2a5c6373..73d50b7 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -724,7 +724,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;
@@ -793,7 +793,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);
@@ -829,7 +829,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 ?
@@ -1366,7 +1366,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;
@@ -1437,7 +1437,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.
@@ -1483,7 +1483,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.
--
1.8.0.rc2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: xfs: Remove boolean_t typedef completely.
2012-11-13 0:36 xfs: Remove boolean_t typedef completely Thiago Farina
@ 2012-11-13 1:53 ` Dave Chinner
2012-11-13 2:02 ` Thiago Farina
0 siblings, 1 reply; 4+ messages in thread
From: Dave Chinner @ 2012-11-13 1:53 UTC (permalink / raw)
To: Thiago Farina; +Cc: linux list, Ben Myers, Alex Elder, xfs
On Mon, Nov 12, 2012 at 10:36:47PM -0200, Thiago Farina wrote:
> On Mon, Nov 12, 2012 at 10:24 PM, Dave Chinner <david@fromorbit.com> wrote:
> > On Mon, Nov 12, 2012 at 09:36:17PM -0200, Thiago Farina wrote:
> >> Hi,
> >>
> >> Please, take a look.
> >>
> >> Patch attached.
> >
> > It's a good start for a cleanup, but there's no point in removing
> > the boolean_t from one file and then not removing it from the rest
> > of the XFS code. It's only used in a handful of places, so just
> > remove it completely.
> >
> Done.
>
> Please, take another look.
>
> > Also, can you please place patches in line rather than attaching
> > them. Attaching them means they cannot be quoted in reply. See
> > Documentation/SubmittingPatches and Documentation/email-clients.txt
> > for guidelines.
> >
> Sorry, patch attached.
It's still attached as a base64 encoded attachment, not as inline
text....
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: xfs: Remove boolean_t typedef completely.
2012-11-13 1:53 ` Dave Chinner
@ 2012-11-13 2:02 ` Thiago Farina
2012-11-13 2:32 ` Ben Myers
0 siblings, 1 reply; 4+ messages in thread
From: Thiago Farina @ 2012-11-13 2:02 UTC (permalink / raw)
To: Dave Chinner; +Cc: linux list, Ben Myers, Alex Elder, xfs
On Mon, Nov 12, 2012 at 11:53 PM, Dave Chinner <david@fromorbit.com> wrote:
> On Mon, Nov 12, 2012 at 10:36:47PM -0200, Thiago Farina wrote:
>> On Mon, Nov 12, 2012 at 10:24 PM, Dave Chinner <david@fromorbit.com> wrote:
>> > On Mon, Nov 12, 2012 at 09:36:17PM -0200, Thiago Farina wrote:
>> >> Hi,
>> >>
>> >> Please, take a look.
>> >>
>> >> Patch attached.
>> >
>> > It's a good start for a cleanup, but there's no point in removing
>> > the boolean_t from one file and then not removing it from the rest
>> > of the XFS code. It's only used in a handful of places, so just
>> > remove it completely.
>> >
>> Done.
>>
>> Please, take another look.
>>
>> > Also, can you please place patches in line rather than attaching
>> > them. Attaching them means they cannot be quoted in reply. See
>> > Documentation/SubmittingPatches and Documentation/email-clients.txt
>> > for guidelines.
>> >
>> Sorry, patch attached.
>
> It's still attached as a base64 encoded attachment, not as inline
> text....
>
Yep, sorry about that. Is just a text file from $(git format-patch master);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: xfs: Remove boolean_t typedef completely.
2012-11-13 2:02 ` Thiago Farina
@ 2012-11-13 2:32 ` Ben Myers
0 siblings, 0 replies; 4+ messages in thread
From: Ben Myers @ 2012-11-13 2:32 UTC (permalink / raw)
To: Thiago Farina; +Cc: Dave Chinner, Alex Elder, linux list, xfs
Hi Thiago,
On Tue, Nov 13, 2012 at 12:02:14AM -0200, Thiago Farina wrote:
> On Mon, Nov 12, 2012 at 11:53 PM, Dave Chinner <david@fromorbit.com> wrote:
> > On Mon, Nov 12, 2012 at 10:36:47PM -0200, Thiago Farina wrote:
> >> On Mon, Nov 12, 2012 at 10:24 PM, Dave Chinner <david@fromorbit.com> wrote:
> >> > On Mon, Nov 12, 2012 at 09:36:17PM -0200, Thiago Farina wrote:
> >> >> Hi,
> >> >>
> >> >> Please, take a look.
> >> >>
> >> >> Patch attached.
> >> >
> >> > It's a good start for a cleanup, but there's no point in removing
> >> > the boolean_t from one file and then not removing it from the rest
> >> > of the XFS code. It's only used in a handful of places, so just
> >> > remove it completely.
> >> >
> >> Done.
> >>
> >> Please, take another look.
> >>
> >> > Also, can you please place patches in line rather than attaching
> >> > them. Attaching them means they cannot be quoted in reply. See
> >> > Documentation/SubmittingPatches and Documentation/email-clients.txt
> >> > for guidelines.
> >> >
> >> Sorry, patch attached.
> >
> > It's still attached as a base64 encoded attachment, not as inline
> > text....
> >
> Yep, sorry about that. Is just a text file from $(git format-patch master);
If you don't mind another try... it would be helpful if you could resend the
patch inline. It helps to facilitate a discussion of the patch along with your
text should it be necessary.
You're only touching xfs, so you can drop linux-kernel if you want.
Thanks,
Ben
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-13 2:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-13 0:36 xfs: Remove boolean_t typedef completely Thiago Farina
2012-11-13 1:53 ` Dave Chinner
2012-11-13 2:02 ` Thiago Farina
2012-11-13 2:32 ` Ben Myers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).