diff options
author | Richard Knutsson <ricknu-0@student.ltu.se> | 2006-10-01 02:27:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:19 -0400 |
commit | 4d81715fc5dfa1680ad47d7edf3ac4a74c5bf104 (patch) | |
tree | ec5de5f1e7aa18911fe76957e106fc3492048e86 /fs/jfs/jfs_extent.c | |
parent | c49c31115067bc7c9a51ffdc735a515151dfa3eb (diff) |
[PATCH] fs/jfs: Conversion to generic boolean
Conversion of booleans to: generic-boolean.patch (2006-08-23)
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
Cc: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/jfs/jfs_extent.c')
-rw-r--r-- | fs/jfs/jfs_extent.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c index 4c74f0944f7e..933b7457bfbd 100644 --- a/fs/jfs/jfs_extent.c +++ b/fs/jfs/jfs_extent.c | |||
@@ -74,7 +74,7 @@ static s64 extRoundDown(s64 nb); | |||
74 | * extent that is used as an allocation hint if the | 74 | * extent that is used as an allocation hint if the |
75 | * xaddr of the xad is non-zero. on successful exit, | 75 | * xaddr of the xad is non-zero. on successful exit, |
76 | * the xad describes the newly allocated extent. | 76 | * the xad describes the newly allocated extent. |
77 | * abnr - boolean_t indicating whether the newly allocated extent | 77 | * abnr - bool indicating whether the newly allocated extent |
78 | * should be marked as allocated but not recorded. | 78 | * should be marked as allocated but not recorded. |
79 | * | 79 | * |
80 | * RETURN VALUES: | 80 | * RETURN VALUES: |
@@ -83,7 +83,7 @@ static s64 extRoundDown(s64 nb); | |||
83 | * -ENOSPC - insufficient disk resources. | 83 | * -ENOSPC - insufficient disk resources. |
84 | */ | 84 | */ |
85 | int | 85 | int |
86 | extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr) | 86 | extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr) |
87 | { | 87 | { |
88 | struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); | 88 | struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); |
89 | s64 nxlen, nxaddr, xoff, hint, xaddr = 0; | 89 | s64 nxlen, nxaddr, xoff, hint, xaddr = 0; |
@@ -117,7 +117,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr) | |||
117 | * following the hint extent. | 117 | * following the hint extent. |
118 | */ | 118 | */ |
119 | if (offsetXAD(xp) + nxlen == xoff && | 119 | if (offsetXAD(xp) + nxlen == xoff && |
120 | abnr == ((xp->flag & XAD_NOTRECORDED) ? TRUE : FALSE)) | 120 | abnr == ((xp->flag & XAD_NOTRECORDED) ? true : false)) |
121 | xaddr = hint + nxlen; | 121 | xaddr = hint + nxlen; |
122 | 122 | ||
123 | /* adjust the hint to the last block of the extent */ | 123 | /* adjust the hint to the last block of the extent */ |
@@ -148,7 +148,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr) | |||
148 | } | 148 | } |
149 | 149 | ||
150 | /* determine the value of the extent flag */ | 150 | /* determine the value of the extent flag */ |
151 | xflag = (abnr == TRUE) ? XAD_NOTRECORDED : 0; | 151 | xflag = abnr ? XAD_NOTRECORDED : 0; |
152 | 152 | ||
153 | /* if we can extend the hint extent to cover the current request, | 153 | /* if we can extend the hint extent to cover the current request, |
154 | * extend it. otherwise, insert a new extent to | 154 | * extend it. otherwise, insert a new extent to |
@@ -203,7 +203,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr) | |||
203 | * xlen - request size of the resulting extent. | 203 | * xlen - request size of the resulting extent. |
204 | * xp - pointer to an xad. on successful exit, the xad | 204 | * xp - pointer to an xad. on successful exit, the xad |
205 | * describes the newly allocated extent. | 205 | * describes the newly allocated extent. |
206 | * abnr - boolean_t indicating whether the newly allocated extent | 206 | * abnr - bool indicating whether the newly allocated extent |
207 | * should be marked as allocated but not recorded. | 207 | * should be marked as allocated but not recorded. |
208 | * | 208 | * |
209 | * RETURN VALUES: | 209 | * RETURN VALUES: |
@@ -211,7 +211,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr) | |||
211 | * -EIO - i/o error. | 211 | * -EIO - i/o error. |
212 | * -ENOSPC - insufficient disk resources. | 212 | * -ENOSPC - insufficient disk resources. |
213 | */ | 213 | */ |
214 | int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, boolean_t abnr) | 214 | int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, bool abnr) |
215 | { | 215 | { |
216 | struct super_block *sb = ip->i_sb; | 216 | struct super_block *sb = ip->i_sb; |
217 | s64 xaddr, xlen, nxaddr, delta, xoff; | 217 | s64 xaddr, xlen, nxaddr, delta, xoff; |
@@ -476,7 +476,7 @@ int extFill(struct inode *ip, xad_t * xp) | |||
476 | XADaddress(xp, 0); | 476 | XADaddress(xp, 0); |
477 | 477 | ||
478 | /* allocate an extent to fill the hole */ | 478 | /* allocate an extent to fill the hole */ |
479 | if ((rc = extAlloc(ip, nbperpage, blkno, xp, FALSE))) | 479 | if ((rc = extAlloc(ip, nbperpage, blkno, xp, false))) |
480 | return (rc); | 480 | return (rc); |
481 | 481 | ||
482 | assert(lengthPXD(xp) == nbperpage); | 482 | assert(lengthPXD(xp) == nbperpage); |