You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
JFS: Whitespace cleanup and remove some dead code
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
This commit is contained in:
Dave Kleikamp
+51
-51
@@ -34,8 +34,8 @@ static int extBrealloc(struct inode *, s64, s64, s64 *, s64 *);
|
||||
#endif
|
||||
static s64 extRoundDown(s64 nb);
|
||||
|
||||
#define DPD(a) (printk("(a): %d\n",(a)))
|
||||
#define DPC(a) (printk("(a): %c\n",(a)))
|
||||
#define DPD(a) (printk("(a): %d\n",(a)))
|
||||
#define DPC(a) (printk("(a): %c\n",(a)))
|
||||
#define DPL1(a) \
|
||||
{ \
|
||||
if ((a) >> 32) \
|
||||
@@ -51,19 +51,19 @@ static s64 extRoundDown(s64 nb);
|
||||
printk("(a): %x\n",(a) << 32); \
|
||||
}
|
||||
|
||||
#define DPD1(a) (printk("(a): %d ",(a)))
|
||||
#define DPX(a) (printk("(a): %08x\n",(a)))
|
||||
#define DPX1(a) (printk("(a): %08x ",(a)))
|
||||
#define DPS(a) (printk("%s\n",(a)))
|
||||
#define DPE(a) (printk("\nENTERING: %s\n",(a)))
|
||||
#define DPE1(a) (printk("\nENTERING: %s",(a)))
|
||||
#define DPS1(a) (printk(" %s ",(a)))
|
||||
#define DPD1(a) (printk("(a): %d ",(a)))
|
||||
#define DPX(a) (printk("(a): %08x\n",(a)))
|
||||
#define DPX1(a) (printk("(a): %08x ",(a)))
|
||||
#define DPS(a) (printk("%s\n",(a)))
|
||||
#define DPE(a) (printk("\nENTERING: %s\n",(a)))
|
||||
#define DPE1(a) (printk("\nENTERING: %s",(a)))
|
||||
#define DPS1(a) (printk(" %s ",(a)))
|
||||
|
||||
|
||||
/*
|
||||
* NAME: extAlloc()
|
||||
*
|
||||
* FUNCTION: allocate an extent for a specified page range within a
|
||||
* FUNCTION: allocate an extent for a specified page range within a
|
||||
* file.
|
||||
*
|
||||
* PARAMETERS:
|
||||
@@ -78,9 +78,9 @@ static s64 extRoundDown(s64 nb);
|
||||
* should be marked as allocated but not recorded.
|
||||
*
|
||||
* RETURN VALUES:
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
*/
|
||||
int
|
||||
extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr)
|
||||
@@ -192,9 +192,9 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr)
|
||||
|
||||
#ifdef _NOTYET
|
||||
/*
|
||||
* NAME: extRealloc()
|
||||
* NAME: extRealloc()
|
||||
*
|
||||
* FUNCTION: extend the allocation of a file extent containing a
|
||||
* FUNCTION: extend the allocation of a file extent containing a
|
||||
* partial back last page.
|
||||
*
|
||||
* PARAMETERS:
|
||||
@@ -207,9 +207,9 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr)
|
||||
* should be marked as allocated but not recorded.
|
||||
*
|
||||
* RETURN VALUES:
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
*/
|
||||
int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, bool abnr)
|
||||
{
|
||||
@@ -345,9 +345,9 @@ exit:
|
||||
|
||||
|
||||
/*
|
||||
* NAME: extHint()
|
||||
* NAME: extHint()
|
||||
*
|
||||
* FUNCTION: produce an extent allocation hint for a file offset.
|
||||
* FUNCTION: produce an extent allocation hint for a file offset.
|
||||
*
|
||||
* PARAMETERS:
|
||||
* ip - the inode of the file.
|
||||
@@ -356,8 +356,8 @@ exit:
|
||||
* the hint.
|
||||
*
|
||||
* RETURN VALUES:
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
*/
|
||||
int extHint(struct inode *ip, s64 offset, xad_t * xp)
|
||||
{
|
||||
@@ -387,7 +387,7 @@ int extHint(struct inode *ip, s64 offset, xad_t * xp)
|
||||
lxdl.nlxd = 1;
|
||||
lxdl.lxd = &lxd;
|
||||
LXDoffset(&lxd, prev)
|
||||
LXDlength(&lxd, nbperpage);
|
||||
LXDlength(&lxd, nbperpage);
|
||||
|
||||
xadl.maxnxad = 1;
|
||||
xadl.nxad = 0;
|
||||
@@ -397,11 +397,11 @@ int extHint(struct inode *ip, s64 offset, xad_t * xp)
|
||||
if ((rc = xtLookupList(ip, &lxdl, &xadl, 0)))
|
||||
return (rc);
|
||||
|
||||
/* check if not extent exists for the previous page.
|
||||
/* check if no extent exists for the previous page.
|
||||
* this is possible for sparse files.
|
||||
*/
|
||||
if (xadl.nxad == 0) {
|
||||
// assert(ISSPARSE(ip));
|
||||
// assert(ISSPARSE(ip));
|
||||
return (0);
|
||||
}
|
||||
|
||||
@@ -410,28 +410,28 @@ int extHint(struct inode *ip, s64 offset, xad_t * xp)
|
||||
*/
|
||||
xp->flag &= XAD_NOTRECORDED;
|
||||
|
||||
if(xadl.nxad != 1 || lengthXAD(xp) != nbperpage) {
|
||||
if(xadl.nxad != 1 || lengthXAD(xp) != nbperpage) {
|
||||
jfs_error(ip->i_sb, "extHint: corrupt xtree");
|
||||
return -EIO;
|
||||
}
|
||||
}
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* NAME: extRecord()
|
||||
* NAME: extRecord()
|
||||
*
|
||||
* FUNCTION: change a page with a file from not recorded to recorded.
|
||||
* FUNCTION: change a page with a file from not recorded to recorded.
|
||||
*
|
||||
* PARAMETERS:
|
||||
* ip - inode of the file.
|
||||
* cp - cbuf of the file page.
|
||||
*
|
||||
* RETURN VALUES:
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
*/
|
||||
int extRecord(struct inode *ip, xad_t * xp)
|
||||
{
|
||||
@@ -451,9 +451,9 @@ int extRecord(struct inode *ip, xad_t * xp)
|
||||
|
||||
#ifdef _NOTYET
|
||||
/*
|
||||
* NAME: extFill()
|
||||
* NAME: extFill()
|
||||
*
|
||||
* FUNCTION: allocate disk space for a file page that represents
|
||||
* FUNCTION: allocate disk space for a file page that represents
|
||||
* a file hole.
|
||||
*
|
||||
* PARAMETERS:
|
||||
@@ -461,16 +461,16 @@ int extRecord(struct inode *ip, xad_t * xp)
|
||||
* cp - cbuf of the file page represent the hole.
|
||||
*
|
||||
* RETURN VALUES:
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
*/
|
||||
int extFill(struct inode *ip, xad_t * xp)
|
||||
{
|
||||
int rc, nbperpage = JFS_SBI(ip->i_sb)->nbperpage;
|
||||
s64 blkno = offsetXAD(xp) >> ip->i_blkbits;
|
||||
|
||||
// assert(ISSPARSE(ip));
|
||||
// assert(ISSPARSE(ip));
|
||||
|
||||
/* initialize the extent allocation hint */
|
||||
XADaddress(xp, 0);
|
||||
@@ -489,7 +489,7 @@ int extFill(struct inode *ip, xad_t * xp)
|
||||
/*
|
||||
* NAME: extBalloc()
|
||||
*
|
||||
* FUNCTION: allocate disk blocks to form an extent.
|
||||
* FUNCTION: allocate disk blocks to form an extent.
|
||||
*
|
||||
* initially, we will try to allocate disk blocks for the
|
||||
* requested size (nblocks). if this fails (nblocks
|
||||
@@ -513,9 +513,9 @@ int extFill(struct inode *ip, xad_t * xp)
|
||||
* allocated block range.
|
||||
*
|
||||
* RETURN VALUES:
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
*/
|
||||
static int
|
||||
extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)
|
||||
@@ -580,7 +580,7 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)
|
||||
/*
|
||||
* NAME: extBrealloc()
|
||||
*
|
||||
* FUNCTION: attempt to extend an extent's allocation.
|
||||
* FUNCTION: attempt to extend an extent's allocation.
|
||||
*
|
||||
* Initially, we will try to extend the extent's allocation
|
||||
* in place. If this fails, we'll try to move the extent
|
||||
@@ -597,8 +597,8 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)
|
||||
*
|
||||
* PARAMETERS:
|
||||
* ip - the inode of the file.
|
||||
* blkno - starting block number of the extents current allocation.
|
||||
* nblks - number of blocks within the extents current allocation.
|
||||
* blkno - starting block number of the extents current allocation.
|
||||
* nblks - number of blocks within the extents current allocation.
|
||||
* newnblks - pointer to a s64 value. on entry, this value is the
|
||||
* the new desired extent size (number of blocks). on
|
||||
* successful exit, this value is set to the extent's actual
|
||||
@@ -606,9 +606,9 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)
|
||||
* newblkno - the starting block number of the extents new allocation.
|
||||
*
|
||||
* RETURN VALUES:
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
* 0 - success
|
||||
* -EIO - i/o error.
|
||||
* -ENOSPC - insufficient disk resources.
|
||||
*/
|
||||
static int
|
||||
extBrealloc(struct inode *ip,
|
||||
@@ -634,16 +634,16 @@ extBrealloc(struct inode *ip,
|
||||
|
||||
|
||||
/*
|
||||
* NAME: extRoundDown()
|
||||
* NAME: extRoundDown()
|
||||
*
|
||||
* FUNCTION: round down a specified number of blocks to the next
|
||||
* FUNCTION: round down a specified number of blocks to the next
|
||||
* smallest power of 2 number.
|
||||
*
|
||||
* PARAMETERS:
|
||||
* nb - the inode of the file.
|
||||
*
|
||||
* RETURN VALUES:
|
||||
* next smallest power of 2 number.
|
||||
* next smallest power of 2 number.
|
||||
*/
|
||||
static s64 extRoundDown(s64 nb)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user