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

Commit 4d81715f authored by Richard Knutsson's avatar Richard Knutsson Committed by Linus Torvalds
Browse files

[PATCH] fs/jfs: Conversion to generic boolean 



Conversion of booleans to: generic-boolean.patch (2006-08-23)

Signed-off-by: default avatarRichard Knutsson <ricknu-0@student.ltu.se>
Cc: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c49c3111

fs/jfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ int jfs_get_block(struct inode *ip, sector_t lblock, 
#ifdef _JFS_4K

	if ((rc = extHint(ip, lblock64 << ip->i_sb->s_blocksize_bits, &xad)))

		goto unlock;

	rc = extAlloc(ip, xlen, lblock64, &xad, FALSE);

	rc = extAlloc(ip, xlen, lblock64, &xad, false);

	if (rc)

		goto unlock;

fs/jfs/jfs_dmap.c

+6 −6
Original line number Diff line number Diff line
@@ -403,8 +403,8 @@ int dbFree(struct inode *ip, s64 blkno, s64 nblocks) 
 *

 * PARAMETERS:

 *      ipbmap	-  pointer to in-core inode for the block map.

 *      free	- TRUE if block range is to be freed from the persistent

 *		  map; FALSE if it is to   be allocated.

 *      free	-  'true' if block range is to be freed from the persistent

 *		   map; 'false' if it is to   be allocated.

 *      blkno	-  starting block number of the range.

 *      nblocks	-  number of contiguous blocks in the range.

 *      tblk	-  transaction block;
@@ -2394,7 +2394,7 @@ static int dbFreeBits(struct bmap * bmp, struct dmap * dp, s64 blkno, 
 *		   requires the dmap control page to be adjusted.

 *      newval	-  the new value of the lower level dmap or dmap control

 *		   page root.

 *      alloc	-  TRUE if adjustment is due to an allocation.

 *      alloc	-  'true' if adjustment is due to an allocation.

 *      level	-  current level of dmap control page (i.e. L0, L1, L2) to

 *		   be adjusted.

 *
@@ -3290,7 +3290,7 @@ int dbExtendFS(struct inode *ipbmap, s64 blkno, s64 nblocks) 
{

	struct jfs_sb_info *sbi = JFS_SBI(ipbmap->i_sb);

	int nbperpage = sbi->nbperpage;

	int i, i0 = TRUE, j, j0 = TRUE, k, n;

	int i, i0 = true, j, j0 = true, k, n;

	s64 newsize;

	s64 p;

	struct metapage *mp, *l2mp, *l1mp = NULL, *l0mp = NULL;
@@ -3398,7 +3398,7 @@ int dbExtendFS(struct inode *ipbmap, s64 blkno, s64 nblocks) 
			j = (blkno & (MAXL1SIZE - 1)) >> L2MAXL0SIZE;

			l1leaf = l1dcp->stree + CTLLEAFIND + j;

			p = BLKTOL0(blkno, sbi->l2nbperpage);

			j0 = FALSE;

			j0 = false;

		} else {

			/* assign/init L1 page */

			l1mp = get_metapage(ipbmap, p, PSIZE, 0);
@@ -3432,7 +3432,7 @@ int dbExtendFS(struct inode *ipbmap, s64 blkno, s64 nblocks) 
				l0leaf = l0dcp->stree + CTLLEAFIND + i;

				p = BLKTODMAP(blkno,

					      sbi->l2nbperpage);

				i0 = FALSE;

				i0 = false;

			} else {

				/* assign/init L0 page */

				l0mp = get_metapage(ipbmap, p, PSIZE, 0);

fs/jfs/jfs_extent.c

+7 −7
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static s64 extRoundDown(s64 nb); 
 *		  extent that is used as an allocation hint if the

 *		  xaddr of the xad is non-zero.  on successful exit,

 *		  the xad describes the newly allocated extent.

 *	abnr	- boolean_t indicating whether the newly allocated extent

 *	abnr	- bool indicating whether the newly allocated extent

 *		  should be marked as allocated but not recorded.

 *

 * RETURN VALUES:
@@ -83,7 +83,7 @@ static s64 extRoundDown(s64 nb); 
 *      -ENOSPC	- insufficient disk resources.

 */

int

extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr)

extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr)

{

	struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);

	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) 
		 * following the hint extent.

		 */

		if (offsetXAD(xp) + nxlen == xoff &&

		    abnr == ((xp->flag & XAD_NOTRECORDED) ? TRUE : FALSE))

		    abnr == ((xp->flag & XAD_NOTRECORDED) ? true : false))

			xaddr = hint + nxlen;



		/* 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) 
	}



	/* determine the value of the extent flag */

	xflag = (abnr == TRUE) ? XAD_NOTRECORDED : 0;

	xflag = abnr ? XAD_NOTRECORDED : 0;



	/* if we can extend the hint extent to cover the current request, 

	 * 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) 
 *	xlen	- request size of the resulting extent.

 *	xp	- pointer to an xad. on successful exit, the xad

 *		  describes the newly allocated extent.

 *	abnr	- boolean_t indicating whether the newly allocated extent

 *	abnr	- bool indicating whether the newly allocated extent

 *		  should be marked as allocated but not recorded.

 *

 * RETURN VALUES:
@@ -211,7 +211,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr) 
 *      -EIO	- i/o error.

 *      -ENOSPC	- insufficient disk resources.

 */

int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, boolean_t abnr)

int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, bool abnr)

{

	struct super_block *sb = ip->i_sb;

	s64 xaddr, xlen, nxaddr, delta, xoff;
@@ -476,7 +476,7 @@ int extFill(struct inode *ip, xad_t * xp) 
	XADaddress(xp, 0);



	/* allocate an extent to fill the hole */

	if ((rc = extAlloc(ip, nbperpage, blkno, xp, FALSE)))

	if ((rc = extAlloc(ip, nbperpage, blkno, xp, false)))

		return (rc);



	assert(lengthPXD(xp) == nbperpage);

fs/jfs/jfs_extent.h

+2 −2
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 
#define	INOHINT(ip)	\

	(addressPXD(&(JFS_IP(ip)->ixpxd)) + lengthPXD(&(JFS_IP(ip)->ixpxd)) - 1)



extern int	extAlloc(struct inode *, s64, s64, xad_t *, boolean_t);

extern int	extAlloc(struct inode *, s64, s64, xad_t *, bool);

extern int	extFill(struct inode *, xad_t *);

extern int	extHint(struct inode *, s64, xad_t *);

extern int	extRealloc(struct inode *, s64, xad_t *, boolean_t);

extern int	extRealloc(struct inode *, s64, xad_t *, bool);

extern int	extRecord(struct inode *, xad_t *);



#endif	/* _H_JFS_EXTENT */

fs/jfs/jfs_imap.c

+13 −13
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ static HLIST_HEAD(aggregate_hash); 
/*

 * forward references

 */

static int diAllocAG(struct inomap *, int, boolean_t, struct inode *);

static int diAllocAny(struct inomap *, int, boolean_t, struct inode *);

static int diAllocAG(struct inomap *, int, bool, struct inode *);

static int diAllocAny(struct inomap *, int, bool, struct inode *);

static int diAllocBit(struct inomap *, struct iag *, int);

static int diAllocExt(struct inomap *, int, struct inode *);

static int diAllocIno(struct inomap *, int, struct inode *);
@@ -1345,7 +1345,7 @@ diInitInode(struct inode *ip, int iagno, int ino, int extno, struct iag * iagp) 
 *

 * PARAMETERS:

 *      pip  	- pointer to incore inode for the parent inode.

 *      dir  	- TRUE if the new disk inode is for a directory.

 *      dir  	- 'true' if the new disk inode is for a directory.

 *      ip  	- pointer to a new inode

 *

 * RETURN VALUES:
@@ -1353,7 +1353,7 @@ diInitInode(struct inode *ip, int iagno, int ino, int extno, struct iag * iagp) 
 *      -ENOSPC	- insufficient disk resources.

 *      -EIO  	- i/o error.

 */

int diAlloc(struct inode *pip, boolean_t dir, struct inode *ip)

int diAlloc(struct inode *pip, bool dir, struct inode *ip)

{

	int rc, ino, iagno, addext, extno, bitno, sword;

	int nwords, rem, i, agno;
@@ -1375,7 +1375,7 @@ int diAlloc(struct inode *pip, boolean_t dir, struct inode *ip) 
	/* for a directory, the allocation policy is to start 

	 * at the ag level using the preferred ag.

	 */

	if (dir == TRUE) {

	if (dir) {

		agno = dbNextAG(JFS_SBI(pip->i_sb)->ipbmap);

		AG_LOCK(imap, agno);

		goto tryag;
@@ -1651,7 +1651,7 @@ int diAlloc(struct inode *pip, boolean_t dir, struct inode *ip) 
 * PARAMETERS:

 *      imap  	- pointer to inode map control structure.

 *      agno  	- allocation group to allocate from.

 *      dir  	- TRUE if the new disk inode is for a directory.

 *      dir  	- 'true' if the new disk inode is for a directory.

 *      ip  	- pointer to the new inode to be filled in on successful return

 *		  with the disk inode number allocated, its extent address

 *		  and the start of the ag.
@@ -1662,7 +1662,7 @@ int diAlloc(struct inode *pip, boolean_t dir, struct inode *ip) 
 *      -EIO  	- i/o error.

 */

static int

diAllocAG(struct inomap * imap, int agno, boolean_t dir, struct inode *ip)

diAllocAG(struct inomap * imap, int agno, bool dir, struct inode *ip)

{

	int rc, addext, numfree, numinos;
@@ -1682,7 +1682,7 @@ diAllocAG(struct inomap * imap, int agno, boolean_t dir, struct inode *ip) 
	 * if there are a small number of free inodes or number of free

	 * inodes is a small percentage of the number of backed inodes.

	 */

	if (dir == TRUE)

	if (dir)

		addext = (numfree < 64 ||

			  (numfree < 256

			   && ((numfree * 100) / numinos) <= 20));
@@ -1721,7 +1721,7 @@ diAllocAG(struct inomap * imap, int agno, boolean_t dir, struct inode *ip) 
 * PARAMETERS:

 *      imap  	- pointer to inode map control structure.

 *      agno  	- primary allocation group (to avoid).

 *      dir  	- TRUE if the new disk inode is for a directory.

 *      dir  	- 'true' if the new disk inode is for a directory.

 *      ip  	- pointer to a new inode to be filled in on successful return

 *		  with the disk inode number allocated, its extent address

 *		  and the start of the ag.
@@ -1732,7 +1732,7 @@ diAllocAG(struct inomap * imap, int agno, boolean_t dir, struct inode *ip) 
 *      -EIO  	- i/o error.

 */

static int

diAllocAny(struct inomap * imap, int agno, boolean_t dir, struct inode *ip)

diAllocAny(struct inomap * imap, int agno, bool dir, struct inode *ip)

{

	int ag, rc;

	int maxag = JFS_SBI(imap->im_ipimap->i_sb)->bmap->db_maxag;
@@ -2749,7 +2749,7 @@ static int diFindFree(u32 word, int start) 
 * PARAMETERS:

 *	ipimap	- Incore inode map inode

 *	inum	- Number of inode to mark in permanent map

 *	is_free	- If TRUE indicates inode should be marked freed, otherwise

 *	is_free	- If 'true' indicates inode should be marked freed, otherwise

 *		  indicates inode should be marked allocated.

 *

 * RETURN VALUES:
@@ -2757,7 +2757,7 @@ static int diFindFree(u32 word, int start) 
 */

int

diUpdatePMap(struct inode *ipimap,

	     unsigned long inum, boolean_t is_free, struct tblock * tblk)

	     unsigned long inum, bool is_free, struct tblock * tblk)

{

	int rc;

	struct iag *iagp;
@@ -2796,7 +2796,7 @@ diUpdatePMap(struct inode *ipimap, 
	/* 

	 * mark the inode free in persistent map:

	 */

	if (is_free == TRUE) {

	if (is_free) {

		/* The inode should have been allocated both in working

		 * map and in persistent map;

		 * the inode will be freed from working map at the release