[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>
This commit is contained in:
Родитель
c49c311150
Коммит
4d81715fc5
|
@ -227,7 +227,7 @@ int jfs_get_block(struct inode *ip, sector_t lblock,
|
||||||
#ifdef _JFS_4K
|
#ifdef _JFS_4K
|
||||||
if ((rc = extHint(ip, lblock64 << ip->i_sb->s_blocksize_bits, &xad)))
|
if ((rc = extHint(ip, lblock64 << ip->i_sb->s_blocksize_bits, &xad)))
|
||||||
goto unlock;
|
goto unlock;
|
||||||
rc = extAlloc(ip, xlen, lblock64, &xad, FALSE);
|
rc = extAlloc(ip, xlen, lblock64, &xad, false);
|
||||||
if (rc)
|
if (rc)
|
||||||
goto unlock;
|
goto unlock;
|
||||||
|
|
||||||
|
|
|
@ -403,8 +403,8 @@ int dbFree(struct inode *ip, s64 blkno, s64 nblocks)
|
||||||
*
|
*
|
||||||
* PARAMETERS:
|
* PARAMETERS:
|
||||||
* ipbmap - pointer to in-core inode for the block map.
|
* ipbmap - pointer to in-core inode for the block map.
|
||||||
* free - TRUE if block range is to be freed from the persistent
|
* free - 'true' if block range is to be freed from the persistent
|
||||||
* map; FALSE if it is to be allocated.
|
* map; 'false' if it is to be allocated.
|
||||||
* blkno - starting block number of the range.
|
* blkno - starting block number of the range.
|
||||||
* nblocks - number of contiguous blocks in the range.
|
* nblocks - number of contiguous blocks in the range.
|
||||||
* tblk - transaction block;
|
* 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.
|
* requires the dmap control page to be adjusted.
|
||||||
* newval - the new value of the lower level dmap or dmap control
|
* newval - the new value of the lower level dmap or dmap control
|
||||||
* page root.
|
* 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
|
* level - current level of dmap control page (i.e. L0, L1, L2) to
|
||||||
* be adjusted.
|
* 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);
|
struct jfs_sb_info *sbi = JFS_SBI(ipbmap->i_sb);
|
||||||
int nbperpage = sbi->nbperpage;
|
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 newsize;
|
||||||
s64 p;
|
s64 p;
|
||||||
struct metapage *mp, *l2mp, *l1mp = NULL, *l0mp = NULL;
|
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;
|
j = (blkno & (MAXL1SIZE - 1)) >> L2MAXL0SIZE;
|
||||||
l1leaf = l1dcp->stree + CTLLEAFIND + j;
|
l1leaf = l1dcp->stree + CTLLEAFIND + j;
|
||||||
p = BLKTOL0(blkno, sbi->l2nbperpage);
|
p = BLKTOL0(blkno, sbi->l2nbperpage);
|
||||||
j0 = FALSE;
|
j0 = false;
|
||||||
} else {
|
} else {
|
||||||
/* assign/init L1 page */
|
/* assign/init L1 page */
|
||||||
l1mp = get_metapage(ipbmap, p, PSIZE, 0);
|
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;
|
l0leaf = l0dcp->stree + CTLLEAFIND + i;
|
||||||
p = BLKTODMAP(blkno,
|
p = BLKTODMAP(blkno,
|
||||||
sbi->l2nbperpage);
|
sbi->l2nbperpage);
|
||||||
i0 = FALSE;
|
i0 = false;
|
||||||
} else {
|
} else {
|
||||||
/* assign/init L0 page */
|
/* assign/init L0 page */
|
||||||
l0mp = get_metapage(ipbmap, p, PSIZE, 0);
|
l0mp = get_metapage(ipbmap, p, PSIZE, 0);
|
||||||
|
|
|
@ -74,7 +74,7 @@ static s64 extRoundDown(s64 nb);
|
||||||
* extent that is used as an allocation hint if the
|
* extent that is used as an allocation hint if the
|
||||||
* xaddr of the xad is non-zero. on successful exit,
|
* xaddr of the xad is non-zero. on successful exit,
|
||||||
* the xad describes the newly allocated extent.
|
* 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.
|
* should be marked as allocated but not recorded.
|
||||||
*
|
*
|
||||||
* RETURN VALUES:
|
* RETURN VALUES:
|
||||||
|
@ -83,7 +83,7 @@ static s64 extRoundDown(s64 nb);
|
||||||
* -ENOSPC - insufficient disk resources.
|
* -ENOSPC - insufficient disk resources.
|
||||||
*/
|
*/
|
||||||
int
|
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);
|
struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
|
||||||
s64 nxlen, nxaddr, xoff, hint, xaddr = 0;
|
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.
|
* following the hint extent.
|
||||||
*/
|
*/
|
||||||
if (offsetXAD(xp) + nxlen == xoff &&
|
if (offsetXAD(xp) + nxlen == xoff &&
|
||||||
abnr == ((xp->flag & XAD_NOTRECORDED) ? TRUE : FALSE))
|
abnr == ((xp->flag & XAD_NOTRECORDED) ? true : false))
|
||||||
xaddr = hint + nxlen;
|
xaddr = hint + nxlen;
|
||||||
|
|
||||||
/* adjust the hint to the last block of the extent */
|
/* 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 */
|
/* 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,
|
/* if we can extend the hint extent to cover the current request,
|
||||||
* extend it. otherwise, insert a new extent to
|
* 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.
|
* xlen - request size of the resulting extent.
|
||||||
* xp - pointer to an xad. on successful exit, the xad
|
* xp - pointer to an xad. on successful exit, the xad
|
||||||
* describes the newly allocated extent.
|
* 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.
|
* should be marked as allocated but not recorded.
|
||||||
*
|
*
|
||||||
* RETURN VALUES:
|
* RETURN VALUES:
|
||||||
|
@ -211,7 +211,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr)
|
||||||
* -EIO - i/o error.
|
* -EIO - i/o error.
|
||||||
* -ENOSPC - insufficient disk resources.
|
* -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;
|
struct super_block *sb = ip->i_sb;
|
||||||
s64 xaddr, xlen, nxaddr, delta, xoff;
|
s64 xaddr, xlen, nxaddr, delta, xoff;
|
||||||
|
@ -476,7 +476,7 @@ int extFill(struct inode *ip, xad_t * xp)
|
||||||
XADaddress(xp, 0);
|
XADaddress(xp, 0);
|
||||||
|
|
||||||
/* allocate an extent to fill the hole */
|
/* 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);
|
return (rc);
|
||||||
|
|
||||||
assert(lengthPXD(xp) == nbperpage);
|
assert(lengthPXD(xp) == nbperpage);
|
||||||
|
|
|
@ -22,10 +22,10 @@
|
||||||
#define INOHINT(ip) \
|
#define INOHINT(ip) \
|
||||||
(addressPXD(&(JFS_IP(ip)->ixpxd)) + lengthPXD(&(JFS_IP(ip)->ixpxd)) - 1)
|
(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 extFill(struct inode *, xad_t *);
|
||||||
extern int extHint(struct inode *, s64, 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 *);
|
extern int extRecord(struct inode *, xad_t *);
|
||||||
|
|
||||||
#endif /* _H_JFS_EXTENT */
|
#endif /* _H_JFS_EXTENT */
|
||||||
|
|
|
@ -78,8 +78,8 @@ static HLIST_HEAD(aggregate_hash);
|
||||||
/*
|
/*
|
||||||
* forward references
|
* forward references
|
||||||
*/
|
*/
|
||||||
static int diAllocAG(struct inomap *, int, boolean_t, struct inode *);
|
static int diAllocAG(struct inomap *, int, bool, struct inode *);
|
||||||
static int diAllocAny(struct inomap *, int, boolean_t, struct inode *);
|
static int diAllocAny(struct inomap *, int, bool, struct inode *);
|
||||||
static int diAllocBit(struct inomap *, struct iag *, int);
|
static int diAllocBit(struct inomap *, struct iag *, int);
|
||||||
static int diAllocExt(struct inomap *, int, struct inode *);
|
static int diAllocExt(struct inomap *, int, struct inode *);
|
||||||
static int diAllocIno(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:
|
* PARAMETERS:
|
||||||
* pip - pointer to incore inode for the parent inode.
|
* 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
|
* ip - pointer to a new inode
|
||||||
*
|
*
|
||||||
* RETURN VALUES:
|
* RETURN VALUES:
|
||||||
|
@ -1353,7 +1353,7 @@ diInitInode(struct inode *ip, int iagno, int ino, int extno, struct iag * iagp)
|
||||||
* -ENOSPC - insufficient disk resources.
|
* -ENOSPC - insufficient disk resources.
|
||||||
* -EIO - i/o error.
|
* -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 rc, ino, iagno, addext, extno, bitno, sword;
|
||||||
int nwords, rem, i, agno;
|
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
|
/* for a directory, the allocation policy is to start
|
||||||
* at the ag level using the preferred ag.
|
* at the ag level using the preferred ag.
|
||||||
*/
|
*/
|
||||||
if (dir == TRUE) {
|
if (dir) {
|
||||||
agno = dbNextAG(JFS_SBI(pip->i_sb)->ipbmap);
|
agno = dbNextAG(JFS_SBI(pip->i_sb)->ipbmap);
|
||||||
AG_LOCK(imap, agno);
|
AG_LOCK(imap, agno);
|
||||||
goto tryag;
|
goto tryag;
|
||||||
|
@ -1651,7 +1651,7 @@ int diAlloc(struct inode *pip, boolean_t dir, struct inode *ip)
|
||||||
* PARAMETERS:
|
* PARAMETERS:
|
||||||
* imap - pointer to inode map control structure.
|
* imap - pointer to inode map control structure.
|
||||||
* agno - allocation group to allocate from.
|
* 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
|
* ip - pointer to the new inode to be filled in on successful return
|
||||||
* with the disk inode number allocated, its extent address
|
* with the disk inode number allocated, its extent address
|
||||||
* and the start of the ag.
|
* 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.
|
* -EIO - i/o error.
|
||||||
*/
|
*/
|
||||||
static int
|
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;
|
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
|
* if there are a small number of free inodes or number of free
|
||||||
* inodes is a small percentage of the number of backed inodes.
|
* inodes is a small percentage of the number of backed inodes.
|
||||||
*/
|
*/
|
||||||
if (dir == TRUE)
|
if (dir)
|
||||||
addext = (numfree < 64 ||
|
addext = (numfree < 64 ||
|
||||||
(numfree < 256
|
(numfree < 256
|
||||||
&& ((numfree * 100) / numinos) <= 20));
|
&& ((numfree * 100) / numinos) <= 20));
|
||||||
|
@ -1721,7 +1721,7 @@ diAllocAG(struct inomap * imap, int agno, boolean_t dir, struct inode *ip)
|
||||||
* PARAMETERS:
|
* PARAMETERS:
|
||||||
* imap - pointer to inode map control structure.
|
* imap - pointer to inode map control structure.
|
||||||
* agno - primary allocation group (to avoid).
|
* 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
|
* ip - pointer to a new inode to be filled in on successful return
|
||||||
* with the disk inode number allocated, its extent address
|
* with the disk inode number allocated, its extent address
|
||||||
* and the start of the ag.
|
* 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.
|
* -EIO - i/o error.
|
||||||
*/
|
*/
|
||||||
static int
|
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 ag, rc;
|
||||||
int maxag = JFS_SBI(imap->im_ipimap->i_sb)->bmap->db_maxag;
|
int maxag = JFS_SBI(imap->im_ipimap->i_sb)->bmap->db_maxag;
|
||||||
|
@ -2749,7 +2749,7 @@ static int diFindFree(u32 word, int start)
|
||||||
* PARAMETERS:
|
* PARAMETERS:
|
||||||
* ipimap - Incore inode map inode
|
* ipimap - Incore inode map inode
|
||||||
* inum - Number of inode to mark in permanent map
|
* 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.
|
* indicates inode should be marked allocated.
|
||||||
*
|
*
|
||||||
* RETURN VALUES:
|
* RETURN VALUES:
|
||||||
|
@ -2757,7 +2757,7 @@ static int diFindFree(u32 word, int start)
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
diUpdatePMap(struct inode *ipimap,
|
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;
|
int rc;
|
||||||
struct iag *iagp;
|
struct iag *iagp;
|
||||||
|
@ -2796,7 +2796,7 @@ diUpdatePMap(struct inode *ipimap,
|
||||||
/*
|
/*
|
||||||
* mark the inode free in persistent map:
|
* mark the inode free in persistent map:
|
||||||
*/
|
*/
|
||||||
if (is_free == TRUE) {
|
if (is_free) {
|
||||||
/* The inode should have been allocated both in working
|
/* The inode should have been allocated both in working
|
||||||
* map and in persistent map;
|
* map and in persistent map;
|
||||||
* the inode will be freed from working map at the release
|
* the inode will be freed from working map at the release
|
||||||
|
|
|
@ -159,11 +159,11 @@ struct inomap {
|
||||||
#define im_maxag im_imap.in_maxag
|
#define im_maxag im_imap.in_maxag
|
||||||
|
|
||||||
extern int diFree(struct inode *);
|
extern int diFree(struct inode *);
|
||||||
extern int diAlloc(struct inode *, boolean_t, struct inode *);
|
extern int diAlloc(struct inode *, bool, struct inode *);
|
||||||
extern int diSync(struct inode *);
|
extern int diSync(struct inode *);
|
||||||
/* external references */
|
/* external references */
|
||||||
extern int diUpdatePMap(struct inode *ipimap, unsigned long inum,
|
extern int diUpdatePMap(struct inode *ipimap, unsigned long inum,
|
||||||
boolean_t is_free, struct tblock * tblk);
|
bool is_free, struct tblock * tblk);
|
||||||
extern int diExtendFS(struct inode *ipimap, struct inode *ipbmap);
|
extern int diExtendFS(struct inode *ipimap, struct inode *ipbmap);
|
||||||
extern int diMount(struct inode *);
|
extern int diMount(struct inode *);
|
||||||
extern int diUnmount(struct inode *, int);
|
extern int diUnmount(struct inode *, int);
|
||||||
|
|
|
@ -65,10 +65,10 @@ extern struct metapage *__get_metapage(struct inode *inode,
|
||||||
int absolute, unsigned long new);
|
int absolute, unsigned long new);
|
||||||
|
|
||||||
#define read_metapage(inode, lblock, size, absolute)\
|
#define read_metapage(inode, lblock, size, absolute)\
|
||||||
__get_metapage(inode, lblock, size, absolute, FALSE)
|
__get_metapage(inode, lblock, size, absolute, false)
|
||||||
|
|
||||||
#define get_metapage(inode, lblock, size, absolute)\
|
#define get_metapage(inode, lblock, size, absolute)\
|
||||||
__get_metapage(inode, lblock, size, absolute, TRUE)
|
__get_metapage(inode, lblock, size, absolute, true)
|
||||||
|
|
||||||
extern void release_metapage(struct metapage *);
|
extern void release_metapage(struct metapage *);
|
||||||
extern void grab_metapage(struct metapage *);
|
extern void grab_metapage(struct metapage *);
|
||||||
|
|
|
@ -2393,7 +2393,7 @@ static void txUpdateMap(struct tblock * tblk)
|
||||||
* unlock mapper/write lock
|
* unlock mapper/write lock
|
||||||
*/
|
*/
|
||||||
if (tblk->xflag & COMMIT_CREATE) {
|
if (tblk->xflag & COMMIT_CREATE) {
|
||||||
diUpdatePMap(ipimap, tblk->ino, FALSE, tblk);
|
diUpdatePMap(ipimap, tblk->ino, false, tblk);
|
||||||
/* update persistent block allocation map
|
/* update persistent block allocation map
|
||||||
* for the allocation of inode extent;
|
* for the allocation of inode extent;
|
||||||
*/
|
*/
|
||||||
|
@ -2403,7 +2403,7 @@ static void txUpdateMap(struct tblock * tblk)
|
||||||
txAllocPMap(ipimap, (struct maplock *) & pxdlock, tblk);
|
txAllocPMap(ipimap, (struct maplock *) & pxdlock, tblk);
|
||||||
} else if (tblk->xflag & COMMIT_DELETE) {
|
} else if (tblk->xflag & COMMIT_DELETE) {
|
||||||
ip = tblk->u.ip;
|
ip = tblk->u.ip;
|
||||||
diUpdatePMap(ipimap, ip->i_ino, TRUE, tblk);
|
diUpdatePMap(ipimap, ip->i_ino, true, tblk);
|
||||||
iput(ip);
|
iput(ip);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2451,7 +2451,7 @@ static void txAllocPMap(struct inode *ip, struct maplock * maplock,
|
||||||
if (xad->flag & (XAD_NEW | XAD_EXTENDED)) {
|
if (xad->flag & (XAD_NEW | XAD_EXTENDED)) {
|
||||||
xaddr = addressXAD(xad);
|
xaddr = addressXAD(xad);
|
||||||
xlen = lengthXAD(xad);
|
xlen = lengthXAD(xad);
|
||||||
dbUpdatePMap(ipbmap, FALSE, xaddr,
|
dbUpdatePMap(ipbmap, false, xaddr,
|
||||||
(s64) xlen, tblk);
|
(s64) xlen, tblk);
|
||||||
xad->flag &= ~(XAD_NEW | XAD_EXTENDED);
|
xad->flag &= ~(XAD_NEW | XAD_EXTENDED);
|
||||||
jfs_info("allocPMap: xaddr:0x%lx xlen:%d",
|
jfs_info("allocPMap: xaddr:0x%lx xlen:%d",
|
||||||
|
@ -2462,7 +2462,7 @@ static void txAllocPMap(struct inode *ip, struct maplock * maplock,
|
||||||
pxdlock = (struct pxd_lock *) maplock;
|
pxdlock = (struct pxd_lock *) maplock;
|
||||||
xaddr = addressPXD(&pxdlock->pxd);
|
xaddr = addressPXD(&pxdlock->pxd);
|
||||||
xlen = lengthPXD(&pxdlock->pxd);
|
xlen = lengthPXD(&pxdlock->pxd);
|
||||||
dbUpdatePMap(ipbmap, FALSE, xaddr, (s64) xlen, tblk);
|
dbUpdatePMap(ipbmap, false, xaddr, (s64) xlen, tblk);
|
||||||
jfs_info("allocPMap: xaddr:0x%lx xlen:%d", (ulong) xaddr, xlen);
|
jfs_info("allocPMap: xaddr:0x%lx xlen:%d", (ulong) xaddr, xlen);
|
||||||
} else { /* (maplock->flag & mlckALLOCPXDLIST) */
|
} else { /* (maplock->flag & mlckALLOCPXDLIST) */
|
||||||
|
|
||||||
|
@ -2471,7 +2471,7 @@ static void txAllocPMap(struct inode *ip, struct maplock * maplock,
|
||||||
for (n = 0; n < pxdlistlock->count; n++, pxd++) {
|
for (n = 0; n < pxdlistlock->count; n++, pxd++) {
|
||||||
xaddr = addressPXD(pxd);
|
xaddr = addressPXD(pxd);
|
||||||
xlen = lengthPXD(pxd);
|
xlen = lengthPXD(pxd);
|
||||||
dbUpdatePMap(ipbmap, FALSE, xaddr, (s64) xlen,
|
dbUpdatePMap(ipbmap, false, xaddr, (s64) xlen,
|
||||||
tblk);
|
tblk);
|
||||||
jfs_info("allocPMap: xaddr:0x%lx xlen:%d",
|
jfs_info("allocPMap: xaddr:0x%lx xlen:%d",
|
||||||
(ulong) xaddr, xlen);
|
(ulong) xaddr, xlen);
|
||||||
|
@ -2513,7 +2513,7 @@ void txFreeMap(struct inode *ip,
|
||||||
if (!(xad->flag & XAD_NEW)) {
|
if (!(xad->flag & XAD_NEW)) {
|
||||||
xaddr = addressXAD(xad);
|
xaddr = addressXAD(xad);
|
||||||
xlen = lengthXAD(xad);
|
xlen = lengthXAD(xad);
|
||||||
dbUpdatePMap(ipbmap, TRUE, xaddr,
|
dbUpdatePMap(ipbmap, true, xaddr,
|
||||||
(s64) xlen, tblk);
|
(s64) xlen, tblk);
|
||||||
jfs_info("freePMap: xaddr:0x%lx "
|
jfs_info("freePMap: xaddr:0x%lx "
|
||||||
"xlen:%d",
|
"xlen:%d",
|
||||||
|
@ -2524,7 +2524,7 @@ void txFreeMap(struct inode *ip,
|
||||||
pxdlock = (struct pxd_lock *) maplock;
|
pxdlock = (struct pxd_lock *) maplock;
|
||||||
xaddr = addressPXD(&pxdlock->pxd);
|
xaddr = addressPXD(&pxdlock->pxd);
|
||||||
xlen = lengthPXD(&pxdlock->pxd);
|
xlen = lengthPXD(&pxdlock->pxd);
|
||||||
dbUpdatePMap(ipbmap, TRUE, xaddr, (s64) xlen,
|
dbUpdatePMap(ipbmap, true, xaddr, (s64) xlen,
|
||||||
tblk);
|
tblk);
|
||||||
jfs_info("freePMap: xaddr:0x%lx xlen:%d",
|
jfs_info("freePMap: xaddr:0x%lx xlen:%d",
|
||||||
(ulong) xaddr, xlen);
|
(ulong) xaddr, xlen);
|
||||||
|
@ -2535,7 +2535,7 @@ void txFreeMap(struct inode *ip,
|
||||||
for (n = 0; n < pxdlistlock->count; n++, pxd++) {
|
for (n = 0; n < pxdlistlock->count; n++, pxd++) {
|
||||||
xaddr = addressPXD(pxd);
|
xaddr = addressPXD(pxd);
|
||||||
xlen = lengthPXD(pxd);
|
xlen = lengthPXD(pxd);
|
||||||
dbUpdatePMap(ipbmap, TRUE, xaddr,
|
dbUpdatePMap(ipbmap, true, xaddr,
|
||||||
(s64) xlen, tblk);
|
(s64) xlen, tblk);
|
||||||
jfs_info("freePMap: xaddr:0x%lx xlen:%d",
|
jfs_info("freePMap: xaddr:0x%lx xlen:%d",
|
||||||
(ulong) xaddr, xlen);
|
(ulong) xaddr, xlen);
|
||||||
|
|
|
@ -57,10 +57,6 @@ struct timestruc_t {
|
||||||
#define HIGHORDER 0x80000000u /* high order bit on */
|
#define HIGHORDER 0x80000000u /* high order bit on */
|
||||||
#define ONES 0xffffffffu /* all bit on */
|
#define ONES 0xffffffffu /* all bit on */
|
||||||
|
|
||||||
typedef int boolean_t;
|
|
||||||
#define TRUE 1
|
|
||||||
#define FALSE 0
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* logical xd (lxd)
|
* logical xd (lxd)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -2964,7 +2964,7 @@ xtRelocate(tid_t tid, struct inode * ip, xad_t * oxad, /* old XAD */
|
||||||
cmSetXD(ip, cp, pno, dxaddr, nblks);
|
cmSetXD(ip, cp, pno, dxaddr, nblks);
|
||||||
|
|
||||||
/* release the cbuf, mark it as modified */
|
/* release the cbuf, mark it as modified */
|
||||||
cmPut(cp, TRUE);
|
cmPut(cp, true);
|
||||||
|
|
||||||
dxaddr += nblks;
|
dxaddr += nblks;
|
||||||
sxaddr += nblks;
|
sxaddr += nblks;
|
||||||
|
|
|
@ -97,26 +97,26 @@ static inline int is_os2_xattr(struct jfs_ea *ea)
|
||||||
*/
|
*/
|
||||||
if ((ea->namelen >= XATTR_SYSTEM_PREFIX_LEN) &&
|
if ((ea->namelen >= XATTR_SYSTEM_PREFIX_LEN) &&
|
||||||
!strncmp(ea->name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
|
!strncmp(ea->name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
|
||||||
return FALSE;
|
return false;
|
||||||
/*
|
/*
|
||||||
* Check for "user."
|
* Check for "user."
|
||||||
*/
|
*/
|
||||||
if ((ea->namelen >= XATTR_USER_PREFIX_LEN) &&
|
if ((ea->namelen >= XATTR_USER_PREFIX_LEN) &&
|
||||||
!strncmp(ea->name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN))
|
!strncmp(ea->name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN))
|
||||||
return FALSE;
|
return false;
|
||||||
/*
|
/*
|
||||||
* Check for "security."
|
* Check for "security."
|
||||||
*/
|
*/
|
||||||
if ((ea->namelen >= XATTR_SECURITY_PREFIX_LEN) &&
|
if ((ea->namelen >= XATTR_SECURITY_PREFIX_LEN) &&
|
||||||
!strncmp(ea->name, XATTR_SECURITY_PREFIX,
|
!strncmp(ea->name, XATTR_SECURITY_PREFIX,
|
||||||
XATTR_SECURITY_PREFIX_LEN))
|
XATTR_SECURITY_PREFIX_LEN))
|
||||||
return FALSE;
|
return false;
|
||||||
/*
|
/*
|
||||||
* Check for "trusted."
|
* Check for "trusted."
|
||||||
*/
|
*/
|
||||||
if ((ea->namelen >= XATTR_TRUSTED_PREFIX_LEN) &&
|
if ((ea->namelen >= XATTR_TRUSTED_PREFIX_LEN) &&
|
||||||
!strncmp(ea->name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN))
|
!strncmp(ea->name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN))
|
||||||
return FALSE;
|
return false;
|
||||||
/*
|
/*
|
||||||
* Add any other valid namespace prefixes here
|
* Add any other valid namespace prefixes here
|
||||||
*/
|
*/
|
||||||
|
@ -124,7 +124,7 @@ static inline int is_os2_xattr(struct jfs_ea *ea)
|
||||||
/*
|
/*
|
||||||
* We assume it's OS/2's flat namespace
|
* We assume it's OS/2's flat namespace
|
||||||
*/
|
*/
|
||||||
return TRUE;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int name_size(struct jfs_ea *ea)
|
static inline int name_size(struct jfs_ea *ea)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче