[PATCH] JFS: Make error return codes negative (2 of 4)
Dave Kleikamp <[email protected]> Mon, 25 Aug 2003 14:42:17 -0500
| Newsgroups | gmane.comp.file-systems.jfs.patches |
|---|---|
| Message-ID | <[email protected]> |
# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1097.1.1 -> 1.1097.1.2 # fs/jfs/xattr.c 1.7 -> 1.8 # fs/jfs/namei.c 1.16 -> 1.17 # fs/jfs/jfs_txnmgr.c 1.26 -> 1.27 # fs/jfs/jfs_dmap.c 1.7 -> 1.8 # fs/jfs/jfs_mount.c 1.7 -> 1.8 # fs/jfs/inode.c 1.13 -> 1.14 # fs/jfs/jfs_btree.h 1.3 -> 1.4 # fs/jfs/jfs_imap.c 1.13 -> 1.14 # fs/jfs/jfs_logmgr.c 1.17 -> 1.18 # fs/jfs/jfs_extent.c 1.8 -> 1.9 # fs/jfs/jfs_unicode.c 1.4 -> 1.5 # fs/jfs/jfs_dtree.c 1.12 -> 1.13 # fs/jfs/resize.c 1.8 -> 1.9 # fs/jfs/jfs_xtree.c 1.6 -> 1.7 # fs/jfs/super.c 1.19 -> 1.20 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/08/25 [email protected] 1.1097.1.2 # JFS: Make error return codes negative # # JFS was often returning positive error return codes. This was confusing and # awkward. Patch originally submitted by Thomas Cort. # -------------------------------------------- # diff -Nru a/fs/jfs/inode.c b/fs/jfs/inode.c --- a/fs/jfs/inode.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/inode.c Mon Aug 25 14:10:11 2003 @@ -149,7 +149,7 @@ rc = txCommit(tid, 1, &inode, wait ? COMMIT_SYNC : 0); txEnd(tid); up(&JFS_IP(inode)->commit_sem); - return -rc; + return rc; } void jfs_write_inode(struct inode *inode, int wait) @@ -303,7 +303,7 @@ else IREAD_UNLOCK(ip); } - return -rc; + return rc; } static int jfs_writepage(struct page *page) diff -Nru a/fs/jfs/jfs_btree.h b/fs/jfs/jfs_btree.h --- a/fs/jfs/jfs_btree.h Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/jfs_btree.h Mon Aug 25 14:10:11 2003 @@ -81,7 +81,7 @@ } else {\ P = NULL;\ jfs_err("bread failed!");\ - RC = EIO;\ + RC = -EIO;\ }\ }\ } diff -Nru a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c --- a/fs/jfs/jfs_dmap.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/jfs_dmap.c Mon Aug 25 14:10:11 2003 @@ -189,8 +189,8 @@ * * RETURN VALUES: * 0 - success - * ENOMEM - insufficient memory - * EIO - i/o error + * -ENOMEM - insufficient memory + * -EIO - i/o error */ int dbMount(struct inode *ipbmap) { @@ -205,7 +205,7 @@ /* allocate memory for the in-memory bmap descriptor */ bmp = kmalloc(sizeof(struct bmap), GFP_KERNEL); if (bmp == NULL) - return (ENOMEM); + return -ENOMEM; /* read the on-disk bmap descriptor. */ mp = read_metapage(ipbmap, @@ -213,7 +213,7 @@ PSIZE, 0); if (mp == NULL) { kfree(bmp); - return (EIO); + return -EIO; } /* copy the on-disk bmap descriptor to its in-memory version. */ @@ -268,7 +268,7 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error + * -EIO - i/o error */ int dbUnmount(struct inode *ipbmap, int mounterror) { @@ -316,7 +316,7 @@ PSIZE, 0); if (mp == NULL) { jfs_err("dbSync: read_metapage failed!"); - return (EIO); + return -EIO; } /* copy the in-memory version of the bmap to the on-disk version */ dbmp_le = (struct dbmap *) mp->data; @@ -368,7 +368,7 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error + * -EIO - i/o error */ int dbFree(struct inode *ip, s64 blkno, s64 nblocks) { @@ -414,7 +414,7 @@ mp = read_metapage(ipbmap, lblkno, PSIZE, 0); if (mp == NULL) { IREAD_UNLOCK(ipbmap); - return (EIO); + return -EIO; } dp = (struct dmap *) mp->data; @@ -463,7 +463,7 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error + * -EIO - i/o error */ int dbUpdatePMap(struct inode *ipbmap, @@ -503,7 +503,7 @@ mp = read_metapage(bmp->db_ipbmap, lblkno, PSIZE, 0); if (mp == NULL) - return (EIO); + return -EIO; } dp = (struct dmap *) mp->data; @@ -737,8 +737,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error */ int dbAlloc(struct inode *ip, s64 hint, s64 nblocks, s64 * results) { @@ -758,7 +758,7 @@ #ifdef _STILL_TO_PORT /* DASD limit check F226941 */ if (OVER_LIMIT(ip, nblocks)) - return ENOSPC; + return -ENOSPC; #endif /* _STILL_TO_PORT */ /* get the log2 number of blocks to be allocated. @@ -828,7 +828,7 @@ /* get the buffer for the dmap containing the hint. */ - rc = EIO; + rc = -EIO; lblkno = BLKTODMAP(blkno, bmp->db_l2nbperpage); mp = read_metapage(ipbmap, lblkno, PSIZE, 0); if (mp == NULL) @@ -840,7 +840,7 @@ * blocks beginning at the hint. */ if ((rc = dbAllocNext(bmp, dp, blkno, (int) nblocks)) - != ENOSPC) { + != -ENOSPC) { if (rc == 0) { *results = blkno; DBALLOC(bmp->db_DBmap, bmp->db_mapsize, @@ -869,7 +869,7 @@ */ if ((rc = dbAllocNear(bmp, dp, blkno, (int) nblocks, l2nb, results)) - != ENOSPC) { + != -ENOSPC) { if (rc == 0) { DBALLOC(bmp->db_DBmap, bmp->db_mapsize, *results, nblocks); @@ -884,7 +884,7 @@ * the same dmap as the hint. */ if ((rc = dbAllocDmapLev(bmp, dp, (int) nblocks, l2nb, results)) - != ENOSPC) { + != -ENOSPC) { if (rc == 0) { DBALLOC(bmp->db_DBmap, bmp->db_mapsize, *results, nblocks); @@ -904,7 +904,7 @@ */ IWRITE_LOCK(ipbmap); if ((rc = dbAllocAG(bmp, agno, nblocks, l2nb, results)) - != ENOSPC) { + != -ENOSPC) { if (rc == 0) DBALLOC(bmp->db_DBmap, bmp->db_mapsize, *results, nblocks); @@ -923,7 +923,7 @@ /* Try to allocate within this allocation group. if that fails, try to * allocate anywhere in the map. */ - if ((rc = dbAllocAG(bmp, agno, nblocks, l2nb, results)) == ENOSPC) + if ((rc = dbAllocAG(bmp, agno, nblocks, l2nb, results)) == -ENOSPC) rc = dbAllocAny(bmp, nblocks, l2nb, results); if (rc == 0) { DBALLOC(bmp->db_DBmap, bmp->db_mapsize, *results, nblocks); @@ -953,8 +953,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error */ int dbAllocExact(struct inode *ip, s64 blkno, int nblocks) { @@ -976,13 +976,13 @@ */ if (nblocks <= 0 || nblocks > BPERDMAP || blkno >= bmp->db_mapsize) { IREAD_UNLOCK(ipbmap); - return EINVAL; + return -EINVAL; } if (nblocks > ((s64) 1 << bmp->db_maxfreebud)) { /* the free space is no longer available */ IREAD_UNLOCK(ipbmap); - return ENOSPC; + return -ENOSPC; } /* read in the dmap covering the extent */ @@ -990,7 +990,7 @@ mp = read_metapage(ipbmap, lblkno, PSIZE, 0); if (mp == NULL) { IREAD_UNLOCK(ipbmap); - return (EIO); + return -EIO; } dp = (struct dmap *) mp->data; @@ -1038,8 +1038,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error */ int dbReAlloc(struct inode *ip, @@ -1053,7 +1053,7 @@ *results = blkno; return (0); } else { - if (rc != ENOSPC) + if (rc != -ENOSPC) return (rc); } @@ -1087,8 +1087,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error */ int dbExtend(struct inode *ip, s64 blkno, s64 nblocks, s64 addnblocks) { @@ -1106,7 +1106,7 @@ */ if (((rel_block = blkno & (sbi->nbperpage - 1))) && (rel_block + nblocks + addnblocks > sbi->nbperpage)) - return (ENOSPC); + return -ENOSPC; /* get the last block of the current allocation */ lastblkno = blkno + nblocks - 1; @@ -1133,7 +1133,7 @@ if (addnblocks > BPERDMAP || extblkno >= bmp->db_mapsize || (extblkno & (bmp->db_agsize - 1)) == 0) { IREAD_UNLOCK(ipbmap); - return (ENOSPC); + return -ENOSPC; } /* get the buffer for the dmap containing the first block @@ -1143,7 +1143,7 @@ mp = read_metapage(ipbmap, lblkno, PSIZE, 0); if (mp == NULL) { IREAD_UNLOCK(ipbmap); - return (EIO); + return -EIO; } DBALLOCCK(bmp->db_DBmap, bmp->db_mapsize, blkno, nblocks); @@ -1164,7 +1164,7 @@ } else { /* we were not successful */ release_metapage(mp); - assert(rc == ENOSPC || rc == EIO); + assert(rc == -ENOSPC || rc == -EIO); } return (rc); @@ -1185,8 +1185,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error * * serialization: IREAD_LOCK(ipbmap) held on entry/exit; */ @@ -1212,13 +1212,13 @@ * this dmap. */ if (dbitno + nblocks > BPERDMAP) - return (ENOSPC); + return -ENOSPC; /* check if the starting leaf indicates that anything * is free. */ if (leaf[word] == NOFREE) - return (ENOSPC); + return -ENOSPC; /* check the dmaps words corresponding to block range to see * if the block range is free. not all bits of the first and @@ -1247,7 +1247,7 @@ */ mask = (ONES << (DBWORD - nb) >> wbitno); if ((mask & ~le32_to_cpu(dp->wmap[word])) != mask) - return (ENOSPC); + return -ENOSPC; word += 1; } else { @@ -1265,7 +1265,7 @@ /* does the leaf describe any free space ? */ if (leaf[word] < BUDMIN) - return (ENOSPC); + return -ENOSPC; /* determine the l2 number of bits provided * by this leaf. @@ -1311,8 +1311,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error * * serialization: IREAD_LOCK(ipbmap) held on entry/exit; */ @@ -1360,7 +1360,7 @@ return (rc); } - return (ENOSPC); + return -ENOSPC; } @@ -1413,8 +1413,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error * * note: IWRITE_LOCK(ipmap) held on entry/exit; */ @@ -1457,8 +1457,8 @@ if (bmp->db_agsize == BPERDMAP || bmp->db_agfree[agno] == bmp->db_agsize) { rc = dbAllocCtl(bmp, nblocks, l2nb, blkno, results); - /* assert(!(rc == ENOSPC && bmp->db_agfree[agno] == bmp->db_agsize)); */ - if ((rc == ENOSPC) && + /* assert(!(rc == -ENOSPC && bmp->db_agfree[agno] == bmp->db_agsize)); */ + if ((rc == -ENOSPC) && (bmp->db_agfree[agno] == bmp->db_agsize)) { jfs_err("dbAllocAG: removed assert, but still need to " "debug here\nblkno = 0x%Lx, nblocks = 0x%Lx", @@ -1474,7 +1474,7 @@ lblkno = BLKTOCTL(blkno, bmp->db_l2nbperpage, bmp->db_aglevel); mp = read_metapage(bmp->db_ipbmap, lblkno, PSIZE, 0); if (mp == NULL) - return (EIO); + return -EIO; dcp = (struct dmapctl *) mp->data; budmin = dcp->budmin; @@ -1547,7 +1547,7 @@ if ((rc = dbFindCtl(bmp, l2nb, bmp->db_aglevel - 1, &blkno))) { - assert(rc != ENOSPC); + assert(rc != -ENOSPC); return (rc); } } @@ -1555,16 +1555,16 @@ /* allocate the blocks. */ rc = dbAllocCtl(bmp, nblocks, l2nb, blkno, results); - assert(rc != ENOSPC); + assert(rc != -ENOSPC); return (rc); } /* no space in the allocation group. release the buffer and - * return ENOSPC. + * return -ENOSPC. */ release_metapage(mp); - return (ENOSPC); + return -ENOSPC; } @@ -1589,8 +1589,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error * * serialization: IWRITE_LOCK(ipbmap) held on entry/exit; */ @@ -1611,7 +1611,7 @@ /* allocate the blocks. */ rc = dbAllocCtl(bmp, nblocks, l2nb, blkno, results); - assert(rc != ENOSPC); + assert(rc != -ENOSPC); return (rc); } @@ -1639,8 +1639,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error * * serialization: IWRITE_LOCK(ipbmap) held on entry/exit; */ @@ -1664,7 +1664,7 @@ lblkno = BLKTOCTL(b, bmp->db_l2nbperpage, lev); mp = read_metapage(bmp->db_ipbmap, lblkno, PSIZE, 0); if (mp == NULL) - return (EIO); + return -EIO; dcp = (struct dmapctl *) mp->data; budmin = dcp->budmin; @@ -1683,7 +1683,7 @@ */ if (rc) { assert(lev == level); - return (ENOSPC); + return -ENOSPC; } /* adjust the block number to reflect the location within @@ -1746,8 +1746,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error * * serialization: IWRITE_LOCK(ipbmap) held on entry/exit; */ @@ -1767,7 +1767,7 @@ lblkno = BLKTODMAP(blkno, bmp->db_l2nbperpage); mp = read_metapage(bmp->db_ipbmap, lblkno, PSIZE, 0); if (mp == NULL) - return (EIO); + return -EIO; dp = (struct dmap *) mp->data; /* try to allocate the blocks. @@ -1794,7 +1794,7 @@ lblkno = BLKTODMAP(b, bmp->db_l2nbperpage); mp = read_metapage(bmp->db_ipbmap, lblkno, PSIZE, 0); if (mp == NULL) { - rc = EIO; + rc = -EIO; goto backout; } dp = (struct dmap *) mp->data; @@ -1891,8 +1891,8 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient disk resources - * EIO - i/o error + * -ENOSPC - insufficient disk resources + * -EIO - i/o error * * serialization: IREAD_LOCK(ipbmap), e.g., from dbAlloc(), or * IWRITE_LOCK(ipbmap), e.g., dbAllocCtl(), held on entry/exit; @@ -1912,7 +1912,7 @@ * returns the index of the leaf at which free space was found. */ if (dbFindLeaf((dmtree_t *) & dp->tree, l2nb, &leafidx)) - return (ENOSPC); + return -ENOSPC; /* determine the block number within the file system corresponding * to the leaf at which free space was found. @@ -1957,7 +1957,7 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error + * -EIO - i/o error * * serialization: IREAD_LOCK(ipbmap) or IWRITE_LOCK(ipbmap) held on entry/exit; */ @@ -2012,7 +2012,7 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error + * -EIO - i/o error * * serialization: IREAD_LOCK(ipbmap) or IWRITE_LOCK(ipbmap) held on entry/exit; */ @@ -2392,7 +2392,7 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error + * -EIO - i/o error * * serialization: IREAD_LOCK(ipbmap) or IWRITE_LOCK(ipbmap) held on entry/exit; */ @@ -2412,7 +2412,7 @@ lblkno = BLKTOCTL(blkno, bmp->db_l2nbperpage, level); mp = read_metapage(bmp->db_ipbmap, lblkno, PSIZE, 0); if (mp == NULL) - return (EIO); + return -EIO; dcp = (struct dmapctl *) mp->data; /* determine the leaf number corresponding to the block and @@ -2835,7 +2835,7 @@ * * RETURN VALUES: * 0 - success - * ENOSPC - insufficient free blocks. + * -ENOSPC - insufficient free blocks. */ static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx) { @@ -2845,7 +2845,7 @@ * sufficient free space. */ if (l2nb > tp->dmt_stree[ROOT]) - return (ENOSPC); + return -ENOSPC; /* sufficient free space available. now search down the tree * starting at the next level for the leftmost leaf that @@ -3089,7 +3089,7 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error + * -EIO - i/o error */ int dbAllocBottomUp(struct inode *ip, s64 blkno, s64 nblocks) { @@ -3120,7 +3120,7 @@ mp = read_metapage(ipbmap, lblkno, PSIZE, 0); if (mp == NULL) { IREAD_UNLOCK(ipbmap); - return (EIO); + return -EIO; } dp = (struct dmap *) mp->data; @@ -3530,7 +3530,7 @@ return 0; errout: - return EIO; + return -EIO; } diff -Nru a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c --- a/fs/jfs/jfs_dtree.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/jfs_dtree.c Mon Aug 25 14:10:11 2003 @@ -134,7 +134,7 @@ BT_PUTPAGE(MP);\ updateSuper((IP)->i_sb, FM_DIRTY);\ MP = NULL;\ - RC = EIO;\ + RC = -EIO;\ }\ }\ } @@ -404,7 +404,7 @@ xtInsert(tid, ip, 0, 0, sbi->nbperpage, &xaddr, 0))) { jfs_warn("add_index: xtInsert failed!"); - return -1; + return -EPERM; } ip->i_size = PSIZE; ip->i_blocks += LBLK2PBLK(sb, sbi->nbperpage); @@ -412,7 +412,7 @@ if ((mp = get_index_page(ip, 0)) == 0) { jfs_err("add_index: get_metapage failed!"); xtTruncate(tid, ip, 0, COMMIT_PWMAP); - return -1; + return -EPERM; } tlck = txLock(tid, ip, mp, tlckDATA); llck = (struct linelock *) & tlck->lock; @@ -447,7 +447,7 @@ &xaddr, 0))) { jfs_warn("add_index: xtInsert failed!"); jfs_ip->next_index--; - return -1; + return -EPERM; } ip->i_size += PSIZE; ip->i_blocks += LBLK2PBLK(sb, sbi->nbperpage); @@ -461,7 +461,7 @@ if (mp == 0) { jfs_err("add_index: get/read_metapage failed!"); - return -1; + return -EPERM; } lock_index(tid, ip, mp, index); @@ -588,7 +588,7 @@ (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t), GFP_NOFS); if (ciKey.name == 0) { - rc = ENOMEM; + rc = -ENOMEM; goto dtSearch_Exit2; } @@ -674,7 +674,7 @@ */ if (flag == JFS_CREATE) { *data = inumber; - rc = EEXIST; + rc = -EEXIST; goto out; } @@ -684,7 +684,7 @@ if ((flag == JFS_REMOVE || flag == JFS_RENAME) && *data != inumber) { - rc = ESTALE; + rc = -ESTALE; goto out; } @@ -732,7 +732,7 @@ */ if (flag == JFS_LOOKUP || flag == JFS_REMOVE || flag == JFS_RENAME) { - rc = ENOENT; + rc = -ENOENT; goto out; } @@ -770,7 +770,7 @@ */ jfs_err("stack overrun in dtSearch!"); updateSuper(sb, FM_DIRTY); - rc = EIO; + rc = -EIO; goto out; } btstack->nsplit++; @@ -840,7 +840,7 @@ if (DO_INDEX(ip)) { if (JFS_IP(ip)->next_index == DIREND) { DT_PUTPAGE(mp); - return EMLINK; + return -EMLINK; } n = NDTLEAF(name->namlen); data.leaf.tid = tid; @@ -953,7 +953,7 @@ GFP_NOFS); if (key.name == 0) { DT_PUTPAGE(smp); - rc = ENOMEM; + rc = -ENOMEM; goto dtSplitUp_Exit; } @@ -1328,7 +1328,7 @@ rbn = addressPXD(pxd); rmp = get_metapage(ip, rbn, PSIZE, 1); if (rmp == NULL) - return EIO; + return -EIO; jfs_info("dtSplitPage: ip:0x%p smp:0x%p rmp:0x%p", ip, smp, rmp); @@ -1579,7 +1579,7 @@ ip->i_blocks += LBLK2PBLK(sb, lengthPXD(pxd)); - return 0; + return rc; } @@ -2628,7 +2628,7 @@ * descend down to leftmost child page */ if (p->header.flag & BT_LEAF) - return ESTALE; + return -ESTALE; /* get the leftmost entry */ stbl = DT_GETSTBL(p); @@ -2666,7 +2666,7 @@ bn = le64_to_cpu(p->header.next); else { DT_PUTPAGE(mp); - return ESTALE; + return -ESTALE; } /* unpin current page */ @@ -3068,7 +3068,7 @@ } if ((rc = dtReadFirst(ip, &btstack))) - return -rc; + return rc; DT_GETSEARCH(ip, btstack.top, bn, mp, p, index); } @@ -3268,7 +3268,7 @@ DT_GETPAGE(ip, bn, mp, PSIZE, p, rc); if (rc) { free_page(dirent_buf); - return -rc; + return rc; } } @@ -4434,8 +4434,8 @@ * flag - JFS_RENAME * * RETURNS: - * ESTALE - If entry found does not match orig_ino passed in - * ENOENT - If no entry can be found to match key + * -ESTALE - If entry found does not match orig_ino passed in + * -ENOENT - If no entry can be found to match key * 0 - If successfully modified entry */ int dtModify(tid_t tid, struct inode *ip, diff -Nru a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c --- a/fs/jfs/jfs_extent.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/jfs_extent.c Mon Aug 25 14:10:11 2003 @@ -83,8 +83,8 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error. - * ENOSPC - insufficient disk resources. + * -EIO - i/o error. + * -ENOSPC - insufficient disk resources. */ int extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr) @@ -208,8 +208,8 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error. - * ENOSPC - insufficient disk resources. + * -EIO - i/o error. + * -ENOSPC - insufficient disk resources. */ int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, boolean_t abnr) { @@ -351,7 +351,7 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error. + * -EIO - i/o error. */ int extHint(struct inode *ip, s64 offset, xad_t * xp) { @@ -422,8 +422,8 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error. - * ENOSPC - insufficient disk resources. + * -EIO - i/o error. + * -ENOSPC - insufficient disk resources. */ int extRecord(struct inode *ip, xad_t * xp) { @@ -437,7 +437,7 @@ rc = xtUpdate(0, ip, xp); up(&JFS_IP(ip)->commit_sem); - return (rc); + return rc; } @@ -454,8 +454,8 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error. - * ENOSPC - insufficient disk resources. + * -EIO - i/o error. + * -ENOSPC - insufficient disk resources. */ int extFill(struct inode *ip, xad_t * xp) { @@ -506,8 +506,8 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error. - * ENOSPC - insufficient disk resources. + * -EIO - i/o error. + * -ENOSPC - insufficient disk resources. */ static int extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno) @@ -536,7 +536,7 @@ /* if something other than an out of space error, * stop and return this error. */ - if (rc != ENOSPC) + if (rc != -ENOSPC) return (rc); /* decrease the allocation request size */ @@ -597,8 +597,8 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error. - * ENOSPC - insufficient disk resources. + * -EIO - i/o error. + * -ENOSPC - insufficient disk resources. */ static int extBrealloc(struct inode *ip, @@ -611,7 +611,7 @@ *newblkno = blkno; return (0); } else { - if (rc != ENOSPC) + if (rc != -ENOSPC) return (rc); } diff -Nru a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c --- a/fs/jfs/jfs_imap.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/jfs_imap.c Mon Aug 25 14:10:11 2003 @@ -120,8 +120,8 @@ * * RETURN VALUES: * 0 - success - * ENOMEM - insufficient free virtual memory. - * EIO - i/o error. + * -ENOMEM - insufficient free virtual memory. + * -EIO - i/o error. */ int diMount(struct inode *ipimap) { @@ -137,7 +137,7 @@ imap = (struct inomap *) kmalloc(sizeof(struct inomap), GFP_KERNEL); if (imap == NULL) { jfs_err("diMount: kmalloc returned NULL!"); - return (ENOMEM); + return -ENOMEM; } /* read the on-disk inode map control structure. */ @@ -147,7 +147,7 @@ PSIZE, 0); if (mp == NULL) { kfree(imap); - return (EIO); + return -EIO; } /* copy the on-disk version to the in-memory version. */ @@ -206,8 +206,8 @@ * * RETURN VALUES: * 0 - success - * ENOMEM - insufficient free virtual memory. - * EIO - i/o error. + * -ENOMEM - insufficient free virtual memory. + * -EIO - i/o error. */ int diUnmount(struct inode *ipimap, int mounterror) { @@ -253,7 +253,7 @@ PSIZE, 0); if (mp == NULL) { jfs_err("diSync: get_metapage failed!"); - return EIO; + return -EIO; } /* copy the in-memory version to the on-disk version */ @@ -318,8 +318,8 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error. - * ENOMEM - insufficient memory + * -EIO - i/o error. + * -ENOMEM - insufficient memory * */ int diRead(struct inode *ip) @@ -364,7 +364,7 @@ if ((lengthPXD(&iagp->inoext[extno]) != imap->im_nbperiext) || (addressPXD(&iagp->inoext[extno]) == 0)) { release_metapage(mp); - return ESTALE; + return -ESTALE; } /* get disk block number of the page within the inode extent @@ -399,7 +399,7 @@ mp = read_metapage(ipimap, pageno << sbi->l2nbperpage, PSIZE, 1); if (mp == 0) { jfs_err("diRead: read_metapage failed"); - return EIO; + return -EIO; } /* locate the the disk inode requested */ @@ -409,9 +409,9 @@ if (ip->i_ino != le32_to_cpu(dp->di_number)) { jfs_err("diRead: i_ino != di_number"); updateSuper(ip->i_sb, FM_DIRTY); - rc = EIO; + rc = -EIO; } else if (le32_to_cpu(dp->di_nlink) == 0) - rc = ESTALE; + rc = -ESTALE; else /* copy the disk inode to the in-memory inode */ rc = copy_from_dinode(dp, ip); @@ -617,7 +617,7 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error. + * -EIO - i/o error. */ int diWrite(tid_t tid, struct inode *ip) { @@ -676,7 +676,7 @@ retry: mp = read_metapage(ipimap, pageno << sbi->l2nbperpage, PSIZE, 1); if (mp == 0) - return (EIO); + return -EIO; /* get the pointer to the disk inode */ dp = (struct dinode *) mp->data; @@ -890,7 +890,7 @@ * * RETURN VALUES: * 0 - success - * EIO - i/o error. + * -EIO - i/o error. */ int diFree(struct inode *ip) { @@ -928,7 +928,7 @@ (uint) inum, iagno, imap->im_nextiag); dump_mem("imap", imap, 32); updateSuper(ip->i_sb, FM_DIRTY); - return EIO; + return -EIO; } /* get the allocation group for this ino. @@ -977,7 +977,7 @@ IREAD_UNLOCK(ipimap); AG_UNLOCK(imap, agno); updateSuper(ip->i_sb, FM_DIRTY); - return EIO; + return -EIO; } /* * inode extent still has some inodes or below low water mark: @@ -1367,8 +1367,8 @@ * * RETURN VALUES: * 0 - success. - * ENOSPC - insufficient disk resources. - * EIO - i/o error. + * -ENOSPC - insufficient disk resources. + * -EIO - i/o error. */ int diAlloc(struct inode *pip, boolean_t dir, struct inode *ip) { @@ -1476,7 +1476,7 @@ rc = diAllocBit(imap, iagp, ino); IREAD_UNLOCK(ipimap); if (rc) { - assert(rc == EIO); + assert(rc == -EIO); } else { /* set the results of the allocation * and write the iag. @@ -1553,7 +1553,7 @@ rc = diAllocBit(imap, iagp, ino); IREAD_UNLOCK(ipimap); if (rc) { - assert(rc == EIO); + assert(rc == -EIO); } else { /* set the results of the allocation * and write the iag. @@ -1589,10 +1589,10 @@ * new extent, try to allocate the * disk inode from somewhere else. */ - if (rc == ENOSPC) + if (rc == -ENOSPC) break; - assert(rc == EIO); + assert(rc == -EIO); } else { /* set the results of the allocation * and write the iag. @@ -1631,7 +1631,7 @@ AG_UNLOCK(imap, agno); - if (rc != ENOSPC) + if (rc != -ENOSPC) return (rc); /* @@ -1667,8 +1667,8 @@ * * RETURN VALUES: * 0 - success. - * ENOSPC - insufficient disk resources. - * EIO - i/o error. + * -ENOSPC - insufficient disk resources. + * -EIO - i/o error. */ static int diAllocAG(struct inomap * imap, int agno, boolean_t dir, struct inode *ip) @@ -1684,7 +1684,7 @@ if (numfree > numinos) { jfs_err("diAllocAG: numfree > numinos"); updateSuper(ip->i_sb, FM_DIRTY); - return EIO; + return -EIO; } /* determine if we should allocate a new extent of free inodes @@ -1707,7 +1707,7 @@ * below to allocate a free and existing (already backed) * inode from the ag. */ - if ((rc = diAllocExt(imap, agno, ip)) != ENOSPC) + if ((rc = diAllocExt(imap, agno, ip)) != -ENOSPC) return (rc); } @@ -1738,8 +1738,8 @@ * * RETURN VALUES: * 0 - success. - * ENOSPC - insufficient disk resources. - * EIO - i/o error. + * -ENOSPC - insufficient disk resources. + * -EIO - i/o error. */ static int diAllocAny(struct inomap * imap, int agno, boolean_t dir, struct inode *ip) @@ -1758,7 +1758,7 @@ AG_UNLOCK(imap, ag); - if (rc != ENOSPC) + if (rc != -ENOSPC) return (rc); } @@ -1771,13 +1771,13 @@ AG_UNLOCK(imap, ag); - if (rc != ENOSPC) + if (rc != -ENOSPC) return (rc); } /* no free disk inodes. */ - return (ENOSPC); + return -ENOSPC; } @@ -1803,8 +1803,8 @@ * * RETURN VALUES: * 0 - success. - * ENOSPC - insufficient disk resources. - * EIO - i/o error. + * -ENOSPC - insufficient disk resources. + * -EIO - i/o error. */ static int diAllocIno(struct inomap * imap, int agno, struct inode *ip) { @@ -1815,7 +1815,7 @@ /* check if there are iags on the ag's free inode list. */ if ((iagno = imap->im_agctl[agno].inofree) < 0) - return (ENOSPC); + return -ENOSPC; /* obtain read lock on imap inode */ IREAD_LOCK(imap->im_ipimap); @@ -1837,7 +1837,7 @@ jfs_err(" agno = %d, iagno = %d", agno, iagno); dump_mem("iag", iagp, 64); updateSuper(ip->i_sb, FM_DIRTY); - return EIO; + return -EIO; } /* scan the free inode summary map to find an extent @@ -1913,8 +1913,8 @@ * * RETURN VALUES: * 0 - success. - * ENOSPC - insufficient disk resources. - * EIO - i/o error. + * -ENOSPC - insufficient disk resources. + * -EIO - i/o error. */ static int diAllocExt(struct inomap * imap, int agno, struct inode *ip) { @@ -2018,8 +2018,8 @@ * * RETURN VALUES: * 0 - success. - * ENOSPC - insufficient disk resources. - * EIO - i/o error. + * -ENOSPC - insufficient disk resources. + * -EIO - i/o error. */ static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino) { @@ -2158,8 +2158,8 @@ * * RETURN VALUES: * 0 - success. - * ENOSPC - insufficient disk resources. - * EIO - i/o error. + * -ENOSPC - insufficient disk resources. + * -EIO - i/o error. */ static int diNewExt(struct inomap * imap, struct iag * iagp, int extno) { @@ -2272,7 +2272,7 @@ */ dmp = get_metapage(ipimap, blkno + i, PSIZE, 1); if (dmp == NULL) { - rc = EIO; + rc = -EIO; goto error_out; } dp = (struct dinode *) dmp->data; @@ -2418,8 +2418,8 @@ * * RETURN VALUES: * 0 - success. - * ENOSPC - insufficient disk resources. - * EIO - i/o error. + * -ENOSPC - insufficient disk resources. + * -EIO - i/o error. * * serialization: * AG lock held on entry/exit; @@ -2490,7 +2490,7 @@ /* release the inode map lock */ IWRITE_UNLOCK(ipimap); - rc = ENOSPC; + rc = -ENOSPC; goto out; } @@ -2521,7 +2521,7 @@ /* release the inode map lock */ IWRITE_UNLOCK(ipimap); - rc = EIO; + rc = -EIO; goto out; } iagp = (struct iag *) mp->data; @@ -2553,7 +2553,7 @@ /* release the inode map lock */ IWRITE_UNLOCK(ipimap); - rc = EIO; + rc = -EIO; goto out; } @@ -2619,7 +2619,7 @@ /* read the iag */ if ((rc = diIAGRead(imap, iagno, &mp))) { IREAD_UNLOCK(ipimap); - rc = EIO; + rc = -EIO; goto out; } iagp = (struct iag *) mp->data; @@ -2658,7 +2658,7 @@ * * RETURN VALUES: * 0 - success. - * EIO - i/o error. + * -EIO - i/o error. */ static int diIAGRead(struct inomap * imap, int iagno, struct metapage ** mpp) { @@ -2671,7 +2671,7 @@ /* read the iag. */ *mpp = read_metapage(ipimap, blkno, PSIZE, 0); if (*mpp == NULL) { - return (EIO); + return -EIO; } return (0); @@ -2718,7 +2718,8 @@ * is_free - If TRUE indicates inode should be marked freed, otherwise * indicates inode should be marked allocated. * - * RETURNS: 0 for success + * RETURN VALUES: + * 0 for success */ int diUpdatePMap(struct inode *ipimap, @@ -3016,7 +3017,7 @@ * * RETURN VALUES: * 0 - success - * ENOMEM - insufficient memory + * -ENOMEM - insufficient memory */ static int copy_from_dinode(struct dinode * dip, struct inode *ip) { diff -Nru a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c --- a/fs/jfs/jfs_logmgr.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/jfs_logmgr.c Mon Aug 25 14:10:11 2003 @@ -666,7 +666,7 @@ /* group committed already ? */ if (tblk->flag & tblkGC_COMMITTED) { if (tblk->flag & tblkGC_ERROR) - rc = EIO; + rc = -EIO; LOGGC_UNLOCK(log); return rc; @@ -700,7 +700,7 @@ if (tblk->flag & tblkGC_COMMITTED) { if (tblk->flag & tblkGC_ERROR) - rc = EIO; + rc = -EIO; LOGGC_UNLOCK(log); return rc; @@ -716,7 +716,7 @@ /* removed from commit queue */ if (tblk->flag & tblkGC_ERROR) - rc = EIO; + rc = -EIO; LOGGC_UNLOCK(log); return rc; @@ -1064,7 +1064,7 @@ struct jfs_log *log; if (!(log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL))) - return ENOMEM; + return -ENOMEM; memset(log, 0, sizeof(struct jfs_log)); init_waitqueue_head(&log->syncwait); @@ -1106,12 +1106,11 @@ */ if (!(bdev = bdget(kdev_t_to_nr(JFS_SBI(sb)->logdev)))) { - rc = ENODEV; + rc = -ENODEV; goto free; } if ((rc = blkdev_get(bdev, FMODE_READ|FMODE_WRITE, 0, BDEV_FS))) { - rc = -rc; goto free; } @@ -1164,7 +1163,7 @@ * PARAMETER: log - log structure * * RETURN: 0 - if ok - * EINVAL - bad log magic number or superblock dirty + * -EINVAL - bad log magic number or superblock dirty * error returned from logwait() * * serialization: single first open thread @@ -1206,21 +1205,21 @@ if (logsuper->magic != cpu_to_le32(LOGMAGIC)) { jfs_warn("*** Log Format Error ! ***"); - rc = EINVAL; + rc = -EINVAL; goto errout20; } /* logredo() should have been run successfully. */ if (logsuper->state != cpu_to_le32(LOGREDONE)) { jfs_warn("*** Log Is Dirty ! ***"); - rc = EINVAL; + rc = -EINVAL; goto errout20; } /* initialize log inode from log superblock */ if (test_bit(log_INLINELOG,&log->flag)) { if (log->size != le32_to_cpu(logsuper->size)) { - rc = EINVAL; + rc = -EINVAL; goto errout20; } jfs_info("lmLogInit: inline log:0x%p base:0x%Lx size:0x%x", @@ -1593,7 +1592,7 @@ if (i == MAX_ACTIVE) { jfs_warn("Too many file systems sharing journal!"); lbmFree(bpsuper); - return EMFILE; /* Is there a better rc? */ + return -EMFILE; /* Is there a better rc? */ } } else { for (i = 0; i < MAX_ACTIVE; i++) @@ -1604,7 +1603,7 @@ if (i == MAX_ACTIVE) { jfs_warn("Somebody stomped on the journal!"); lbmFree(bpsuper); - return EIO; + return -EIO; } } @@ -1701,7 +1700,7 @@ error: lbmLogShutdown(log); - return (ENOMEM); + return -ENOMEM; } @@ -1995,7 +1994,7 @@ LCACHE_SLEEP_COND(bp->l_ioevent, (bp->l_flag & lbmDONE), flags); - rc = (bp->l_flag & lbmERROR) ? EIO : 0; + rc = (bp->l_flag & lbmERROR) ? -EIO : 0; if (flag & lbmFREE) lbmfree(bp); diff -Nru a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c --- a/fs/jfs/jfs_mount.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/jfs_mount.c Mon Aug 25 14:10:11 2003 @@ -72,11 +72,11 @@ * * PARAMETER: sb - super block * - * RETURN: EBUSY - device already mounted or open for write - * EBUSY - cvrdvp already mounted; - * EBUSY - mount table full - * ENOTDIR - cvrdvp not directory on a device mount - * ENXIO - device open failure + * RETURN: -EBUSY - device already mounted or open for write + * -EBUSY - cvrdvp already mounted; + * -EBUSY - mount table full + * -ENOTDIR- cvrdvp not directory on a device mount + * -ENXIO - device open failure */ int jfs_mount(struct super_block *sb) { @@ -98,7 +98,7 @@ ipaimap = diReadSpecial(sb, AGGREGATE_I, 0); if (ipaimap == NULL) { jfs_err("jfs_mount: Faild to read AGGREGATE_I"); - rc = EIO; + rc = -EIO; goto errout20; } sbi->ipaimap = ipaimap; @@ -118,7 +118,7 @@ */ ipbmap = diReadSpecial(sb, BMAP_I, 0); if (ipbmap == NULL) { - rc = EIO; + rc = -EIO; goto errout22; } @@ -149,7 +149,7 @@ ipaimap2 = diReadSpecial(sb, AGGREGATE_I, 1); if (ipaimap2 == 0) { jfs_err("jfs_mount: Faild to read AGGREGATE_I"); - rc = EIO; + rc = -EIO; goto errout35; } sbi->ipaimap2 = ipaimap2; @@ -178,7 +178,7 @@ if (ipimap == NULL) { jfs_err("jfs_mount: Failed to read FILESYSTEM_I"); /* open fileset secondary inode allocation map */ - rc = EIO; + rc = -EIO; goto errout40; } jfs_info("jfs_mount: ipimap:0x%p", ipimap); @@ -327,8 +327,7 @@ /* validate fs signature */ if (strncmp(j_sb->s_magic, JFS_MAGIC, 4) || j_sb->s_version > cpu_to_le32(JFS_VERSION)) { - //rc = EFORMAT; - rc = EINVAL; + rc = -EINVAL; goto out; } @@ -336,7 +335,7 @@ #ifdef _JFS_4K if (bsize != PSIZE) { jfs_err("Currently only 4K block size supported!"); - rc = EINVAL; + rc = -EINVAL; goto out; } #endif /* _JFS_4K */ @@ -372,7 +371,7 @@ if (j_sb->s_state != cpu_to_le32(FM_CLEAN) && !(sb->s_flags & MS_RDONLY)) { jfs_err("jfs_mount: Mount Failure: File System Dirty."); - rc = EINVAL; + rc = -EINVAL; goto out; } diff -Nru a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c --- a/fs/jfs/jfs_txnmgr.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/jfs_txnmgr.c Mon Aug 25 14:10:11 2003 @@ -177,7 +177,7 @@ struct tlock * tlck); void mapLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd, struct tlock * tlck); -void txAbortCommit(struct commit * cd, int exval); +static void txAbortCommit(struct commit * cd); static void txAllocPMap(struct inode *ip, struct maplock * maplock, struct tblock * tblk); void txForce(struct tblock * tblk); @@ -256,7 +256,7 @@ size = sizeof(struct tblock) * nTxBlock; TxBlock = (struct tblock *) vmalloc(size); if (TxBlock == NULL) - return ENOMEM; + return -ENOMEM; for (k = 1; k < nTxBlock - 1; k++) { TxBlock[k].next = k + 1; @@ -282,7 +282,7 @@ TxLock = (struct tlock *) vmalloc(size); if (TxLock == NULL) { vfree(TxBlock); - return ENOMEM; + return -ENOMEM; } /* initialize tlock table */ @@ -1099,7 +1099,7 @@ struct inode **iplist, /* list of inode to commit */ int flag) { - int rc = 0, rc1 = 0; + int rc = 0; struct commit cd; struct jfs_log *log; struct tblock *tblk; @@ -1114,7 +1114,7 @@ jfs_info("txCommit, tid = %d, flag = %d", tid, flag); /* is read-only file system ? */ if (isReadOnly(iplist[0])) { - rc = EROFS; + rc = -EROFS; goto TheEnd; } @@ -1297,9 +1297,7 @@ out: if (rc != 0) - txAbortCommit(&cd, rc); - else - rc = rc1; + txAbortCommit(&cd); TheEnd: jfs_info("txCommit: tid = %d, returning %d", tid, rc); @@ -2654,14 +2652,13 @@ * log age of page-frames in memory for which caller has * are reset to 0 (to avoid logwarap). */ -void txAbortCommit(struct commit * cd, int exval) +static void txAbortCommit(struct commit * cd) { struct tblock *tblk; tid_t tid; lid_t lid, next; struct metapage *mp; - assert(exval == EIO || exval == ENOMEM); jfs_warn("txAbortCommit: cd:0x%p", cd); /* diff -Nru a/fs/jfs/jfs_unicode.c b/fs/jfs/jfs_unicode.c --- a/fs/jfs/jfs_unicode.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/jfs_unicode.c Mon Aug 25 14:10:11 2003 @@ -88,20 +88,20 @@ int length = dentry->d_name.len; if (length > JFS_NAME_MAX) - return ENAMETOOLONG; + return -ENAMETOOLONG; uniName->name = kmalloc((length + 1) * sizeof(wchar_t), GFP_NOFS); if (uniName->name == NULL) - return ENOSPC; + return -ENOSPC; uniName->namlen = jfs_strtoUCS(uniName->name, dentry->d_name.name, length, nls_tab); if (uniName->namlen < 0) { kfree(uniName->name); - return -uniName->namlen; + return uniName->namlen; } return 0; diff -Nru a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c --- a/fs/jfs/jfs_xtree.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/jfs_xtree.c Mon Aug 25 14:10:11 2003 @@ -73,7 +73,7 @@ BT_PUTPAGE(MP);\ updateSuper((IP)->i_sb, FM_DIRTY);\ MP = NULL;\ - RC = EIO;\ + RC = -EIO;\ }\ }\ } @@ -814,7 +814,7 @@ /* This test must follow XT_GETSEARCH since mp must be valid if * we branch to out: */ if (cmp == 0) { - rc = EEXIST; + rc = -EEXIST; goto out; } @@ -1033,7 +1033,7 @@ xtSplitRoot(tid, ip, split, &rmp) : xtSplitPage(tid, ip, split, &rmp, &rbn); if (rc) - return EIO; + return -EIO; XT_PUTPAGE(smp); @@ -1238,7 +1238,7 @@ rbn = addressPXD(pxd); rmp = get_metapage(ip, rbn, PSIZE, 1); if (rmp == NULL) - return EIO; + return -EIO; jfs_info("xtSplitPage: ip:0x%p smp:0x%p rmp:0x%p", ip, smp, rmp); @@ -1485,7 +1485,7 @@ rbn = addressPXD(pxd); rmp = get_metapage(ip, rbn, PSIZE, 1); if (rmp == NULL) - return EIO; + return -EIO; jfs_info("xtSplitRoot: ip:0x%p rmp:0x%p", ip, rmp); @@ -2409,7 +2409,7 @@ XT_GETSEARCH(ip, btstack.top, bn, mp, p, index); if (cmp == 0) { - rc = EEXIST; + rc = -EEXIST; goto out; } //insert: @@ -2557,7 +2557,7 @@ if (cmp) { /* unpin the leaf page */ XT_PUTPAGE(mp); - return ENOENT; + return -ENOENT; } /* @@ -2788,7 +2788,7 @@ /* validate extent offset */ offset = xoff << JFS_SBI(ip->i_sb)->l2bsize; if (offset >= ip->i_size) - return ESTALE; /* stale extent */ + return -ESTALE; /* stale extent */ jfs_info("xtRelocate: xtype:%d xoff:0x%lx xlen:0x%x xaddr:0x%lx:0x%lx", xtype, (ulong) xoff, xlen, (ulong) oxaddr, (ulong) nxaddr); @@ -2804,7 +2804,7 @@ return rc; if (cmp) { XT_PUTPAGE(pmp); - return ESTALE; + return -ESTALE; } /* retrieve search result */ @@ -2814,7 +2814,7 @@ xad = &pp->xad[index]; if (addressXAD(xad) != oxaddr || lengthXAD(xad) != xlen) { XT_PUTPAGE(pmp); - return ESTALE; + return -ESTALE; } } else { /* (xtype == XTPAGE) */ @@ -2824,7 +2824,7 @@ return rc; if (cmp) { XT_PUTPAGE(pmp); - return ESTALE; + return -ESTALE; } /* retrieve search result */ @@ -3127,7 +3127,7 @@ if (rc) return rc; if (p->header.flag & BT_LEAF) - return ESTALE; + return -ESTALE; lim = le16_to_cpu(p->header.nextindex) - XTENTRYSTART; @@ -3439,7 +3439,7 @@ getPage: XT_GETPAGE(ip, bn, mp, PSIZE, p, rc); if (rc) - return -rc; + return rc; /* process entries backward from last index */ index = le16_to_cpu(p->header.nextindex) - 1; @@ -3667,7 +3667,7 @@ bn = parent->bn; XT_GETPAGE(ip, bn, mp, PSIZE, p, rc); if (rc) - return -rc; + return rc; index = parent->index; @@ -3924,7 +3924,7 @@ xoff = (committed_size >> JFS_SBI(ip->i_sb)->l2bsize) - 1; rc = xtSearch(ip, xoff, &cmp, &btstack, 0); if (rc) - return -rc; + return rc; assert(cmp == 0); XT_GETSEARCH(ip, btstack.top, bn, mp, p, index); } else { @@ -3941,7 +3941,7 @@ getPage: XT_GETPAGE(ip, bn, mp, PSIZE, p, rc); if (rc) - return -rc; + return rc; /* process entries backward from last index */ index = le16_to_cpu(p->header.nextindex) - 1; @@ -3986,7 +3986,7 @@ bn = parent->bn; XT_GETPAGE(ip, bn, mp, PSIZE, p, rc); if (rc) - return -rc; + return rc; index = parent->index; @@ -4312,7 +4312,7 @@ bn = parent->bn; XT_GETPAGE(ip, bn, mp, PSIZE, p, rc); if (rc) - return EIO; + return -EIO; /* first subroot page which * covers all new allocated blocks diff -Nru a/fs/jfs/namei.c b/fs/jfs/namei.c --- a/fs/jfs/namei.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/namei.c Mon Aug 25 14:10:11 2003 @@ -83,7 +83,7 @@ */ ip = ialloc(dip, mode); if (ip == NULL) { - rc = ENOSPC; + rc = -ENOSPC; goto out2; } @@ -116,7 +116,7 @@ ino = ip->i_ino; if ((rc = dtInsert(tid, dip, &dname, &ino, &btstack))) { jfs_err("jfs_create: dtInsert returned %d", rc); - if (rc == EIO) + if (rc == -EIO) txAbort(tid, 1); /* Marks Filesystem dirty */ else txAbort(tid, 0); /* Filesystem full */ @@ -151,8 +151,8 @@ out1: - jfs_info("jfs_create: rc:%d", -rc); - return -rc; + jfs_info("jfs_create: rc:%d", rc); + return rc; } @@ -186,7 +186,7 @@ /* link count overflow on parent directory ? */ if (dip->i_nlink == JFS_LINK_MAX) { - rc = EMLINK; + rc = -EMLINK; goto out1; } @@ -204,7 +204,7 @@ */ ip = ialloc(dip, S_IFDIR | mode); if (ip == NULL) { - rc = ENOSPC; + rc = -ENOSPC; goto out2; } @@ -238,7 +238,7 @@ if ((rc = dtInsert(tid, dip, &dname, &ino, &btstack))) { jfs_err("jfs_mkdir: dtInsert returned %d", rc); - if (rc == EIO) + if (rc == -EIO) txAbort(tid, 1); /* Marks Filesystem dirty */ else txAbort(tid, 0); /* Filesystem full */ @@ -276,8 +276,8 @@ out1: - jfs_info("jfs_mkdir: rc:%d", -rc); - return -rc; + jfs_info("jfs_mkdir: rc:%d", rc); + return rc; } /* @@ -288,8 +288,8 @@ * PARAMETER: dip - parent inode * dentry - child directory dentry * - * RETURN: EINVAL - if name is . or .. - * EINVAL - if . or .. exist but are invalid. + * RETURN: -EINVAL - if name is . or .. + * -EINVAL - if . or .. exist but are invalid. * errors from subroutines * * note: @@ -313,7 +313,7 @@ /* directory must be empty to be removed */ if (!dtEmpty(ip)) { - rc = ENOTEMPTY; + rc = -ENOTEMPTY; goto out; } @@ -339,7 +339,7 @@ ino = ip->i_ino; if ((rc = dtDelete(tid, dip, &dname, &ino, JFS_REMOVE))) { jfs_err("jfs_rmdir: dtDelete returned %d", rc); - if (rc == EIO) + if (rc == -EIO) txAbort(tid, 1); txEnd(tid); up(&JFS_IP(dip)->commit_sem); @@ -399,7 +399,7 @@ out: jfs_info("jfs_rmdir: rc:%d", rc); - return -rc; + return rc; } /* @@ -455,7 +455,7 @@ ino = ip->i_ino; if ((rc = dtDelete(tid, dip, &dname, &ino, JFS_REMOVE))) { jfs_err("jfs_unlink: dtDelete returned %d", rc); - if (rc == EIO) + if (rc == -EIO) txAbort(tid, 1); /* Marks FS Dirty */ txEnd(tid); up(&JFS_IP(dip)->commit_sem); @@ -485,7 +485,7 @@ up(&JFS_IP(dip)->commit_sem); up(&JFS_IP(ip)->commit_sem); IWRITE_UNLOCK(ip); - rc = -new_size; /* We return -rc */ + rc = new_size; goto out1; } tblk = tid_to_tblock(tid); @@ -521,7 +521,7 @@ new_size = xtTruncate_pmap(tid, ip, new_size); if (new_size < 0) { txAbort(tid, 1); /* Marks FS Dirty */ - rc = -new_size; /* We return -rc */ + rc = new_size; } else rc = txCommit(tid, 2, &iplist[0], COMMIT_SYNC); txEnd(tid); @@ -547,8 +547,8 @@ out1: free_UCSname(&dname); out: - jfs_info("jfs_unlink: rc:%d", -rc); - return -rc; + jfs_info("jfs_unlink: rc:%d", rc); + return rc; } /* @@ -573,7 +573,7 @@ * PARAMETERS: cd - pointer to commit data structure. * current inode is the one to truncate. * - * RETURN : Errors from subroutines + * RETURN: Errors from subroutines */ s64 commitZeroLink(tid_t tid, struct inode *ip) { @@ -767,7 +767,7 @@ down(&JFS_IP(ip)->commit_sem); if (ip->i_nlink == JFS_LINK_MAX) { - rc = EMLINK; + rc = -EMLINK; goto out; } @@ -805,7 +805,7 @@ up(&JFS_IP(ip)->commit_sem); jfs_info("jfs_link: rc:%d", rc); - return -rc; + return rc; } /* @@ -863,7 +863,7 @@ */ ip = ialloc(dip, S_IFLNK | 0777); if (ip == NULL) { - rc = ENOSPC; + rc = -ENOSPC; goto out2; } @@ -955,7 +955,7 @@ if (mp == NULL) { dtDelete(tid, dip, &dname, &ino, JFS_REMOVE); - rc = EIO; + rc = -EIO; goto out3; } memcpy(mp->data, name, copy_size); @@ -975,7 +975,7 @@ ip->i_blocks = LBLK2PBLK(sb, xlen); } else { dtDelete(tid, dip, &dname, &ino, JFS_REMOVE); - rc = ENOSPC; + rc = -ENOSPC; goto out3; } } @@ -1017,8 +1017,8 @@ free_UCSname(&dname); out1: - jfs_info("jfs_symlink: rc:%d", -rc); - return -rc; + jfs_info("jfs_symlink: rc:%d", rc); + return rc; } @@ -1067,7 +1067,7 @@ */ rc = dtSearch(old_dir, &old_dname, &ino, &btstack, JFS_LOOKUP); if (rc || (ino != old_ip->i_ino)) { - rc = ENOENT; + rc = -ENOENT; goto out3; } @@ -1077,26 +1077,26 @@ rc = dtSearch(new_dir, &new_dname, &ino, &btstack, JFS_LOOKUP); if (rc == 0) { if ((new_ip == 0) || (ino != new_ip->i_ino)) { - rc = ESTALE; + rc = -ESTALE; goto out3; } - } else if (rc != ENOENT) + } else if (rc != -ENOENT) goto out3; else if (new_ip) { /* no entry exists, but one was expected */ - rc = ESTALE; + rc = -ESTALE; goto out3; } if (S_ISDIR(old_ip->i_mode)) { if (new_ip) { if (!dtEmpty(new_ip)) { - rc = ENOTEMPTY; + rc = -ENOTEMPTY; goto out3; } } else if ((new_dir != old_dir) && (new_dir->i_nlink == JFS_LINK_MAX)) { - rc = EMLINK; + rc = -EMLINK; goto out3; } } else if (new_ip) @@ -1134,7 +1134,7 @@ /* free block resources */ if ((new_size = commitZeroLink(tid, new_ip)) < 0) { txAbort(tid, 1); /* Marks FS Dirty */ - rc = -new_size; /* We return -rc */ + rc = new_size; goto out4; } tblk = tid_to_tblock(tid); @@ -1251,7 +1251,7 @@ new_size = xtTruncate_pmap(tid, new_ip, new_size); if (new_size < 0) { txAbort(tid, 1); - rc = -new_size; /* We return -rc */ + rc = new_size; } else rc = txCommit(tid, 1, &new_ip, COMMIT_SYNC); txEnd(tid); @@ -1278,7 +1278,7 @@ } jfs_info("jfs_rename: returning %d", rc); - return -rc; + return rc; } @@ -1305,7 +1305,7 @@ ip = ialloc(dir, mode); if (ip == NULL) { - rc = ENOSPC; + rc = -ENOSPC; goto out1; } @@ -1354,7 +1354,7 @@ out: jfs_info("jfs_mknod: returning %d", rc); - return -rc; + return rc; } static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry) @@ -1377,15 +1377,15 @@ else { if ((rc = get_UCSname(&key, dentry, JFS_SBI(dip->i_sb)->nls_tab))) - return ERR_PTR(-rc); + return ERR_PTR(rc); rc = dtSearch(dip, &key, &inum, &btstack, JFS_LOOKUP); free_UCSname(&key); - if (rc == ENOENT) { + if (rc == -ENOENT) { d_add(dentry, NULL); return ERR_PTR(0); } else if (rc) { jfs_err("jfs_lookup: dtSearch returned %d", rc); - return ERR_PTR(-rc); + return ERR_PTR(rc); } } diff -Nru a/fs/jfs/resize.c b/fs/jfs/resize.c --- a/fs/jfs/resize.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/resize.c Mon Aug 25 14:10:11 2003 @@ -184,7 +184,7 @@ /* file system cannot be shrinked */ if (newFSSize < bmp->db_mapsize) { - rc = EINVAL; + rc = -EINVAL; goto out; } @@ -317,8 +317,8 @@ t64 = dbMapFileSizeToMapSize(ipbmap); if (mapSize > t64) { printk(KERN_ERR "jfs_extendfs: mapSize (0x%Lx) > t64 (0x%Lx)\n", - (long long)mapSize, (long long)t64); - rc = EIO; + (long long) mapSize, (long long) t64); + rc = -EIO; goto error_out; } nblocks = min(t64 - mapSize, XSize); diff -Nru a/fs/jfs/super.c b/fs/jfs/super.c --- a/fs/jfs/super.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/super.c Mon Aug 25 14:10:11 2003 @@ -483,7 +483,7 @@ metapage_exit(); free_slab: kmem_cache_destroy(jfs_inode_cachep); - return -rc; + return rc; } static void __exit exit_jfs_fs(void) diff -Nru a/fs/jfs/xattr.c b/fs/jfs/xattr.c --- a/fs/jfs/xattr.c Mon Aug 25 14:10:11 2003 +++ b/fs/jfs/xattr.c Mon Aug 25 14:10:11 2003 @@ -182,7 +182,7 @@ * used for an inline EA. */ if (!(ji->mode2 & INLINEEA) && !(ji->ea.flag & DXD_INLINE)) - return -1; + return -EPERM; DXDsize(ea, size); DXDlength(ea, 0); @@ -252,7 +252,7 @@ rc = dbAlloc(ip, INOHINT(ip), nblocks, &blkno); if (rc) - return -rc; + return rc; /* * Now have nblocks worth of storage to stuff into the FEALIST. @@ -513,7 +513,7 @@ rc = dbAlloc(inode, INOHINT(inode), (s64) blocks_needed, &blkno); if (rc) - return -rc; + return rc; DXDlength(&ea_buf->new_ea, blocks_needed); DXDaddress(&ea_buf->new_ea, blkno);