14 files changed, 66 insertions, 75 deletions

diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index 1c9745be5ada..976e90dc2d1b 100644
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -103,13 +103,11 @@ struct inode_operations jfs_file_inode_operations = {
 const struct file_operations jfs_file_operations = {
         .open           = jfs_open,
         .llseek         = generic_file_llseek,
-        .write          = generic_file_write,
-        .read           = generic_file_read,
+        .write          = do_sync_write,
+        .read           = do_sync_read,
         .aio_read       = generic_file_aio_read,
         .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
-        .readv          = generic_file_readv,
-        .writev         = generic_file_writev,
         .sendfile       = generic_file_sendfile,
         .fsync          = jfs_fsync,
         .release        = jfs_release,
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index a223cf4faa9b..a8cc169235d9 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -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;
 
diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c
index 67b3774820eb..37db52488262 100644
--- a/fs/jfs/ioctl.c
+++ b/fs/jfs/ioctl.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
 #include <linux/ctype.h>
 #include <linux/capability.h>
 #include <linux/time.h>
@@ -22,13 +21,13 @@ static struct {
         long jfs_flag;
         long ext2_flag;
 } jfs_map[] = {
-        {JFS_NOATIME_FL, EXT2_NOATIME_FL},
-        {JFS_DIRSYNC_FL, EXT2_DIRSYNC_FL},
-        {JFS_SYNC_FL, EXT2_SYNC_FL},
-        {JFS_SECRM_FL, EXT2_SECRM_FL},
-        {JFS_UNRM_FL, EXT2_UNRM_FL},
-        {JFS_APPEND_FL, EXT2_APPEND_FL},
-        {JFS_IMMUTABLE_FL, EXT2_IMMUTABLE_FL},
+        {JFS_NOATIME_FL,        FS_NOATIME_FL},
+        {JFS_DIRSYNC_FL,        FS_DIRSYNC_FL},
+        {JFS_SYNC_FL,           FS_SYNC_FL},
+        {JFS_SECRM_FL,          FS_SECRM_FL},
+        {JFS_UNRM_FL,           FS_UNRM_FL},
+        {JFS_APPEND_FL,         FS_APPEND_FL},
+        {JFS_IMMUTABLE_FL,      FS_IMMUTABLE_FL},
         {0, 0},
 };
 
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index c161c98954e0..f05ebb629182 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -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);
diff --git a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c
index 4c74f0944f7e..933b7457bfbd 100644
--- a/fs/jfs/jfs_extent.c
+++ b/fs/jfs/jfs_extent.c
@@ -74,7 +74,7 @@ static s64 extRoundDown(s64 nb);
  *                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);
diff --git a/fs/jfs/jfs_extent.h b/fs/jfs/jfs_extent.h
index e80fc7ced87d..3a7f3f22e989 100644
--- a/fs/jfs/jfs_extent.h
+++ b/fs/jfs/jfs_extent.h
@@ -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 */
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 369d7f39c040..a45ee2489580 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -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
diff --git a/fs/jfs/jfs_imap.h b/fs/jfs/jfs_imap.h
index 6e24465f0f98..e3b7db47db6b 100644
--- a/fs/jfs/jfs_imap.h
+++ b/fs/jfs/jfs_imap.h
@@ -159,11 +159,11 @@ struct inomap {
 #define im_maxag        im_imap.in_maxag
 
 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 *);
 /* external references */
 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 diMount(struct inode *);
 extern int diUnmount(struct inode *, int);
diff --git a/fs/jfs/jfs_metapage.h b/fs/jfs/jfs_metapage.h
index d17a3290f5aa..01a5a455e012 100644
--- a/fs/jfs/jfs_metapage.h
+++ b/fs/jfs/jfs_metapage.h
@@ -65,10 +65,10 @@ extern struct metapage *__get_metapage(struct inode *inode,
                                   int absolute, unsigned long new);
 
 #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)\
-         __get_metapage(inode, lblock, size, absolute, TRUE)
+         __get_metapage(inode, lblock, size, absolute, true)
 
 extern void release_metapage(struct metapage *);
 extern void grab_metapage(struct metapage *);
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 3856efc399c1..ebfa6c061d78 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -2393,7 +2393,7 @@ static void txUpdateMap(struct tblock * tblk)
          * unlock mapper/write lock
          */
         if (tblk->xflag & COMMIT_CREATE) {
-                diUpdatePMap(ipimap, tblk->ino, FALSE, tblk);
+                diUpdatePMap(ipimap, tblk->ino, false, tblk);
                 /* update persistent block allocation map
                  * for the allocation of inode extent;
                  */
@@ -2403,7 +2403,7 @@ static void txUpdateMap(struct tblock * tblk)
                 txAllocPMap(ipimap, (struct maplock *) & pxdlock, tblk);
         } else if (tblk->xflag & COMMIT_DELETE) {
                 ip = tblk->u.ip;
-                diUpdatePMap(ipimap, ip->i_ino, TRUE, tblk);
+                diUpdatePMap(ipimap, ip->i_ino, true, tblk);
                 iput(ip);
         }
 }
@@ -2451,7 +2451,7 @@ static void txAllocPMap(struct inode *ip, struct maplock * maplock,
                         if (xad->flag & (XAD_NEW | XAD_EXTENDED)) {
                                 xaddr = addressXAD(xad);
                                 xlen = lengthXAD(xad);
-                                dbUpdatePMap(ipbmap, FALSE, xaddr,
+                                dbUpdatePMap(ipbmap, false, xaddr,
                                              (s64) xlen, tblk);
                                 xad->flag &= ~(XAD_NEW | XAD_EXTENDED);
                                 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;
                 xaddr = addressPXD(&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);
         } 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++) {
                         xaddr = addressPXD(pxd);
                         xlen = lengthPXD(pxd);
-                        dbUpdatePMap(ipbmap, FALSE, xaddr, (s64) xlen,
+                        dbUpdatePMap(ipbmap, false, xaddr, (s64) xlen,
                                      tblk);
                         jfs_info("allocPMap: xaddr:0x%lx xlen:%d",
                                  (ulong) xaddr, xlen);
@@ -2513,7 +2513,7 @@ void txFreeMap(struct inode *ip,
                                 if (!(xad->flag & XAD_NEW)) {
                                         xaddr = addressXAD(xad);
                                         xlen = lengthXAD(xad);
-                                        dbUpdatePMap(ipbmap, TRUE, xaddr,
+                                        dbUpdatePMap(ipbmap, true, xaddr,
                                                      (s64) xlen, tblk);
                                         jfs_info("freePMap: xaddr:0x%lx "
                                                  "xlen:%d",
@@ -2524,7 +2524,7 @@ void txFreeMap(struct inode *ip,
                         pxdlock = (struct pxd_lock *) maplock;
                         xaddr = addressPXD(&pxdlock->pxd);
                         xlen = lengthPXD(&pxdlock->pxd);
-                        dbUpdatePMap(ipbmap, TRUE, xaddr, (s64) xlen,
+                        dbUpdatePMap(ipbmap, true, xaddr, (s64) xlen,
                                      tblk);
                         jfs_info("freePMap: xaddr:0x%lx xlen:%d",
                                  (ulong) xaddr, xlen);
@@ -2535,7 +2535,7 @@ void txFreeMap(struct inode *ip,
                         for (n = 0; n < pxdlistlock->count; n++, pxd++) {
                                 xaddr = addressPXD(pxd);
                                 xlen = lengthPXD(pxd);
-                                dbUpdatePMap(ipbmap, TRUE, xaddr,
+                                dbUpdatePMap(ipbmap, true, xaddr,
                                              (s64) xlen, tblk);
                                 jfs_info("freePMap: xaddr:0x%lx xlen:%d",
                                          (ulong) xaddr, xlen);
diff --git a/fs/jfs/jfs_types.h b/fs/jfs/jfs_types.h
index 5bfad39a2078..09b252958687 100644
--- a/fs/jfs/jfs_types.h
+++ b/fs/jfs/jfs_types.h
@@ -57,10 +57,6 @@ struct timestruc_t {
 #define HIGHORDER       0x80000000u     /* high order bit on            */
 #define ONES            0xffffffffu     /* all bit on                   */
 
-typedef int boolean_t;
-#define TRUE 1
-#define FALSE 0
-
 /*
  *      logical xd (lxd)
  */
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index e72f4ebb6e9c..c92307d3a57e 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -2964,7 +2964,7 @@ xtRelocate(tid_t tid, struct inode * ip, xad_t * oxad,	/* old XAD */
                         cmSetXD(ip, cp, pno, dxaddr, nblks);
 
                         /* release the cbuf, mark it as modified */
-                        cmPut(cp, TRUE);
+                        cmPut(cp, true);
 
                         dxaddr += nblks;
                         sxaddr += nblks;
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 295268ad231b..b8d16a6aa88f 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -292,7 +292,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
         mark_inode_dirty(ip);
 
         /* update parent directory inode */
-        dip->i_nlink++;         /* for '..' from child directory */
+        inc_nlink(dip);         /* for '..' from child directory */
         dip->i_ctime = dip->i_mtime = CURRENT_TIME;
         mark_inode_dirty(dip);
 
@@ -393,9 +393,8 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
         /* update parent directory's link count corresponding
          * to ".." entry of the target directory deleted
          */
-        dip->i_nlink--;
         dip->i_ctime = dip->i_mtime = CURRENT_TIME;
-        mark_inode_dirty(dip);
+        inode_dec_link_count(dip);
 
         /*
          * OS/2 could have created EA and/or ACL
@@ -415,7 +414,7 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
         JFS_IP(ip)->acl.flag = 0;
 
         /* mark the target directory as deleted */
-        ip->i_nlink = 0;
+        clear_nlink(ip);
         mark_inode_dirty(ip);
 
         rc = txCommit(tid, 2, &iplist[0], 0);
@@ -515,8 +514,7 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
         mark_inode_dirty(dip);
 
         /* update target's inode */
-        ip->i_nlink--;
-        mark_inode_dirty(ip);
+        inode_dec_link_count(ip);
 
         /*
          *      commit zero link count object
@@ -824,7 +822,7 @@ static int jfs_link(struct dentry *old_dentry,
                 goto free_dname;
 
         /* update object inode */
-        ip->i_nlink++;          /* for new link */
+        inc_nlink(ip);          /* for new link */
         ip->i_ctime = CURRENT_TIME;
         dir->i_ctime = dir->i_mtime = CURRENT_TIME;
         mark_inode_dirty(dir);
@@ -835,7 +833,7 @@ static int jfs_link(struct dentry *old_dentry,
         rc = txCommit(tid, 2, &iplist[0], 0);
 
         if (rc) {
-                ip->i_nlink--;
+                ip->i_nlink--; /* never instantiated */
                 iput(ip);
         } else
                 d_instantiate(dentry, ip);
@@ -1155,9 +1153,9 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                               old_ip->i_ino, JFS_RENAME);
                 if (rc)
                         goto out4;
-                new_ip->i_nlink--;
+                drop_nlink(new_ip);
                 if (S_ISDIR(new_ip->i_mode)) {
-                        new_ip->i_nlink--;
+                        drop_nlink(new_ip);
                         if (new_ip->i_nlink) {
                                 mutex_unlock(&JFS_IP(new_ip)->commit_mutex);
                                 if (old_dir != new_dir)
@@ -1208,7 +1206,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                         goto out4;
                 }
                 if (S_ISDIR(old_ip->i_mode))
-                        new_dir->i_nlink++;
+                        inc_nlink(new_dir);
         }
         /*
          * Remove old directory entry
@@ -1223,7 +1221,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                 goto out4;
         }
         if (S_ISDIR(old_ip->i_mode)) {
-                old_dir->i_nlink--;
+                drop_nlink(old_dir);
                 if (old_dir != new_dir) {
                         /*
                          * Change inode number of parent for moved directory
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 9bc5b7c055ce..7a10e1928961 100644
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -97,26 +97,26 @@ static inline int is_os2_xattr(struct jfs_ea *ea)
          */
         if ((ea->namelen >= XATTR_SYSTEM_PREFIX_LEN) &&
             !strncmp(ea->name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
-                return FALSE;
+                return false;
         /*
          * Check for "user."
          */
         if ((ea->namelen >= XATTR_USER_PREFIX_LEN) &&
             !strncmp(ea->name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN))
-                return FALSE;
+                return false;
         /*
          * Check for "security."
          */
         if ((ea->namelen >= XATTR_SECURITY_PREFIX_LEN) &&
             !strncmp(ea->name, XATTR_SECURITY_PREFIX,
                      XATTR_SECURITY_PREFIX_LEN))
-                return FALSE;
+                return false;
         /*
          * Check for "trusted."
          */
         if ((ea->namelen >= 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
          */
@@ -124,7 +124,7 @@ static inline int is_os2_xattr(struct jfs_ea *ea)
         /*
          * We assume it's OS/2's flat namespace
          */
-        return TRUE;
+        return true;
 }
 
 static inline int name_size(struct jfs_ea *ea)