1 files changed, 143 insertions, 143 deletions

diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 25430d0b0d59..f2dc4b986392 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -18,7 +18,7 @@
  */
 
 /*
- *      jfs_txnmgr.c: transaction manager
+ *      jfs_txnmgr.c: transaction manager
  *
  * notes:
  * transaction starts with txBegin() and ends with txCommit()
@@ -60,7 +60,7 @@
 #include "jfs_debug.h"
 
 /*
- *      transaction management structures
+ *      transaction management structures
  */
 static struct {
         int freetid;            /* index of a free tid structure */
@@ -103,19 +103,19 @@ module_param(nTxLock, int, 0);
 MODULE_PARM_DESC(nTxLock,
                  "Number of transaction locks (max:65536)");
 
-struct tblock *TxBlock;         /* transaction block table */
-static int TxLockLWM;           /* Low water mark for number of txLocks used */
-static int TxLockHWM;           /* High water mark for number of txLocks used */
-static int TxLockVHWM;          /* Very High water mark */
-struct tlock *TxLock;           /* transaction lock table */
+struct tblock *TxBlock; /* transaction block table */
+static int TxLockLWM;   /* Low water mark for number of txLocks used */
+static int TxLockHWM;   /* High water mark for number of txLocks used */
+static int TxLockVHWM;  /* Very High water mark */
+struct tlock *TxLock;   /* transaction lock table */
 
 /*
- *      transaction management lock
+ *      transaction management lock
  */
 static DEFINE_SPINLOCK(jfsTxnLock);
 
-#define TXN_LOCK()              spin_lock(&jfsTxnLock)
-#define TXN_UNLOCK()            spin_unlock(&jfsTxnLock)
+#define TXN_LOCK()              spin_lock(&jfsTxnLock)
+#define TXN_UNLOCK()            spin_unlock(&jfsTxnLock)
 
 #define LAZY_LOCK_INIT()        spin_lock_init(&TxAnchor.LazyLock);
 #define LAZY_LOCK(flags)        spin_lock_irqsave(&TxAnchor.LazyLock, flags)
@@ -148,7 +148,7 @@ static inline void TXN_SLEEP_DROP_LOCK(wait_queue_head_t * event)
 #define TXN_WAKEUP(event) wake_up_all(event)
 
 /*
- *      statistics
+ *      statistics
  */
 static struct {
         tid_t maxtid;           /* 4: biggest tid ever used */
@@ -181,8 +181,8 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 static void LogSyncRelease(struct metapage * mp);
 
 /*
- *              transaction block/lock management
- *              ---------------------------------
+ *              transaction block/lock management
+ *              ---------------------------------
  */
 
 /*
@@ -227,9 +227,9 @@ static void txLockFree(lid_t lid)
 }
 
 /*
- * NAME:        txInit()
+ * NAME:        txInit()
  *
- * FUNCTION:    initialize transaction management structures
+ * FUNCTION:    initialize transaction management structures
  *
  * RETURN:
  *
@@ -333,9 +333,9 @@ int txInit(void)
 }
 
 /*
- * NAME:        txExit()
+ * NAME:        txExit()
  *
- * FUNCTION:    clean up when module is unloaded
+ * FUNCTION:    clean up when module is unloaded
  */
 void txExit(void)
 {
@@ -346,12 +346,12 @@ void txExit(void)
 }
 
 /*
- * NAME:        txBegin()
+ * NAME:        txBegin()
  *
- * FUNCTION:    start a transaction.
+ * FUNCTION:    start a transaction.
  *
- * PARAMETER:   sb      - superblock
- *              flag    - force for nested tx;
+ * PARAMETER:   sb      - superblock
+ *              flag    - force for nested tx;
  *
  * RETURN:      tid     - transaction id
  *
@@ -447,13 +447,13 @@ tid_t txBegin(struct super_block *sb, int flag)
 }
 
 /*
- * NAME:        txBeginAnon()
+ * NAME:        txBeginAnon()
  *
- * FUNCTION:    start an anonymous transaction.
+ * FUNCTION:    start an anonymous transaction.
  *              Blocks if logsync or available tlocks are low to prevent
  *              anonymous tlocks from depleting supply.
  *
- * PARAMETER:   sb      - superblock
+ * PARAMETER:   sb      - superblock
  *
  * RETURN:      none
  */
@@ -489,11 +489,11 @@ void txBeginAnon(struct super_block *sb)
 }
 
 /*
- *      txEnd()
+ *      txEnd()
  *
  * function: free specified transaction block.
  *
- *      logsync barrier processing:
+ *      logsync barrier processing:
  *
  * serialization:
  */
@@ -577,13 +577,13 @@ wakeup:
 }
 
 /*
- *      txLock()
+ *      txLock()
  *
  * function: acquire a transaction lock on the specified <mp>
  *
  * parameter:
  *
- * return:      transaction lock id
+ * return:      transaction lock id
  *
  * serialization:
  */
@@ -857,17 +857,17 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
 }
 
 /*
- * NAME:        txRelease()
+ * NAME:        txRelease()
  *
- * FUNCTION:    Release buffers associated with transaction locks, but don't
+ * FUNCTION:    Release buffers associated with transaction locks, but don't
  *              mark homeok yet.  The allows other transactions to modify
  *              buffers, but won't let them go to disk until commit record
  *              actually gets written.
  *
  * PARAMETER:
- *              tblk    -
+ *              tblk    -
  *
- * RETURN:      Errors from subroutines.
+ * RETURN:      Errors from subroutines.
  */
 static void txRelease(struct tblock * tblk)
 {
@@ -896,10 +896,10 @@ static void txRelease(struct tblock * tblk)
 }
 
 /*
- * NAME:        txUnlock()
+ * NAME:        txUnlock()
  *
- * FUNCTION:    Initiates pageout of pages modified by tid in journalled
- *              objects and frees their lockwords.
+ * FUNCTION:    Initiates pageout of pages modified by tid in journalled
+ *              objects and frees their lockwords.
  */
 static void txUnlock(struct tblock * tblk)
 {
@@ -983,10 +983,10 @@ static void txUnlock(struct tblock * tblk)
 }
 
 /*
- *      txMaplock()
+ *      txMaplock()
  *
  * function: allocate a transaction lock for freed page/entry;
- *      for freed page, maplock is used as xtlock/dtlock type;
+ *      for freed page, maplock is used as xtlock/dtlock type;
  */
 struct tlock *txMaplock(tid_t tid, struct inode *ip, int type)
 {
@@ -1057,7 +1057,7 @@ struct tlock *txMaplock(tid_t tid, struct inode *ip, int type)
 }
 
 /*
- *      txLinelock()
+ *      txLinelock()
  *
  * function: allocate a transaction lock for log vector list
  */
@@ -1092,39 +1092,39 @@ struct linelock *txLinelock(struct linelock * tlock)
 }
 
 /*
- *              transaction commit management
- *              -----------------------------
+ *              transaction commit management
+ *              -----------------------------
  */
 
 /*
- * NAME:        txCommit()
- *
- * FUNCTION:    commit the changes to the objects specified in
- *              clist.  For journalled segments only the
- *              changes of the caller are committed, ie by tid.
- *              for non-journalled segments the data are flushed to
- *              disk and then the change to the disk inode and indirect
- *              blocks committed (so blocks newly allocated to the
- *              segment will be made a part of the segment atomically).
- *
- *              all of the segments specified in clist must be in
- *              one file system. no more than 6 segments are needed
- *              to handle all unix svcs.
- *
- *              if the i_nlink field (i.e. disk inode link count)
- *              is zero, and the type of inode is a regular file or
- *              directory, or symbolic link , the inode is truncated
- *              to zero length. the truncation is committed but the
- *              VM resources are unaffected until it is closed (see
- *              iput and iclose).
+ * NAME:        txCommit()
+ *
+ * FUNCTION:    commit the changes to the objects specified in
+ *              clist.  For journalled segments only the
+ *              changes of the caller are committed, ie by tid.
+ *              for non-journalled segments the data are flushed to
+ *              disk and then the change to the disk inode and indirect
+ *              blocks committed (so blocks newly allocated to the
+ *              segment will be made a part of the segment atomically).
+ *
+ *              all of the segments specified in clist must be in
+ *              one file system. no more than 6 segments are needed
+ *              to handle all unix svcs.
+ *
+ *              if the i_nlink field (i.e. disk inode link count)
+ *              is zero, and the type of inode is a regular file or
+ *              directory, or symbolic link , the inode is truncated
+ *              to zero length. the truncation is committed but the
+ *              VM resources are unaffected until it is closed (see
+ *              iput and iclose).
  *
  * PARAMETER:
  *
  * RETURN:
  *
  * serialization:
- *              on entry the inode lock on each segment is assumed
- *              to be held.
+ *              on entry the inode lock on each segment is assumed
+ *              to be held.
  *
  * i/o error:
  */
@@ -1175,7 +1175,7 @@ int txCommit(tid_t tid,		/* transaction identifier */
         if ((flag & (COMMIT_FORCE | COMMIT_SYNC)) == 0)
                 tblk->xflag |= COMMIT_LAZY;
         /*
-         *      prepare non-journaled objects for commit
+         *      prepare non-journaled objects for commit
          *
          * flush data pages of non-journaled file
          * to prevent the file getting non-initialized disk blocks
@@ -1186,7 +1186,7 @@ int txCommit(tid_t tid,		/* transaction identifier */
         cd.nip = nip;
 
         /*
-         *      acquire transaction lock on (on-disk) inodes
+         *      acquire transaction lock on (on-disk) inodes
          *
          * update on-disk inode from in-memory inode
          * acquiring transaction locks for AFTER records
@@ -1262,7 +1262,7 @@ int txCommit(tid_t tid,		/* transaction identifier */
         }
 
         /*
-         *      write log records from transaction locks
+         *      write log records from transaction locks
          *
          * txUpdateMap() resets XAD_NEW in XAD.
          */
@@ -1294,7 +1294,7 @@ int txCommit(tid_t tid,		/* transaction identifier */
                 !test_cflag(COMMIT_Nolink, tblk->u.ip)));
 
         /*
-         *      write COMMIT log record
+         *      write COMMIT log record
          */
         lrd->type = cpu_to_le16(LOG_COMMIT);
         lrd->length = 0;
@@ -1303,7 +1303,7 @@ int txCommit(tid_t tid,		/* transaction identifier */
         lmGroupCommit(log, tblk);
 
         /*
-         *      - transaction is now committed -
+         *      - transaction is now committed -
          */
 
         /*
@@ -1314,11 +1314,11 @@ int txCommit(tid_t tid,		/* transaction identifier */
                 txForce(tblk);
 
         /*
-         *      update allocation map.
+         *      update allocation map.
          *
          * update inode allocation map and inode:
          * free pager lock on memory object of inode if any.
-         * update  block allocation map.
+         * update block allocation map.
          *
          * txUpdateMap() resets XAD_NEW in XAD.
          */
@@ -1326,7 +1326,7 @@ int txCommit(tid_t tid,		/* transaction identifier */
                 txUpdateMap(tblk);
 
         /*
-         *      free transaction locks and pageout/free pages
+         *      free transaction locks and pageout/free pages
          */
         txRelease(tblk);
 
@@ -1335,7 +1335,7 @@ int txCommit(tid_t tid,		/* transaction identifier */
 
 
         /*
-         *      reset in-memory object state
+         *      reset in-memory object state
          */
         for (k = 0; k < cd.nip; k++) {
                 ip = cd.iplist[k];
@@ -1358,11 +1358,11 @@ int txCommit(tid_t tid,		/* transaction identifier */
 }
 
 /*
- * NAME:        txLog()
+ * NAME:        txLog()
  *
- * FUNCTION:    Writes AFTER log records for all lines modified
- *              by tid for segments specified by inodes in comdata.
- *              Code assumes only WRITELOCKS are recorded in lockwords.
+ * FUNCTION:    Writes AFTER log records for all lines modified
+ *              by tid for segments specified by inodes in comdata.
+ *              Code assumes only WRITELOCKS are recorded in lockwords.
  *
  * PARAMETERS:
  *
@@ -1421,12 +1421,12 @@ static int txLog(struct jfs_log * log, struct tblock * tblk, struct commit * cd)
 }
 
 /*
- *      diLog()
+ *      diLog()
  *
- * function:    log inode tlock and format maplock to update bmap;
+ * function:    log inode tlock and format maplock to update bmap;
  */
 static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
-          struct tlock * tlck, struct commit * cd)
+                 struct tlock * tlck, struct commit * cd)
 {
         int rc = 0;
         struct metapage *mp;
@@ -1442,7 +1442,7 @@ static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
         pxd = &lrd->log.redopage.pxd;
 
         /*
-         *      inode after image
+         *      inode after image
          */
         if (tlck->type & tlckENTRY) {
                 /* log after-image for logredo(): */
@@ -1456,7 +1456,7 @@ static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                 tlck->flag |= tlckWRITEPAGE;
         } else if (tlck->type & tlckFREE) {
                 /*
-                 *      free inode extent
+                 *      free inode extent
                  *
                  * (pages of the freed inode extent have been invalidated and
                  * a maplock for free of the extent has been formatted at
@@ -1498,7 +1498,7 @@ static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                 jfs_err("diLog: UFO type tlck:0x%p", tlck);
 #ifdef  _JFS_WIP
         /*
-         *      alloc/free external EA extent
+         *      alloc/free external EA extent
          *
          * a maplock for txUpdateMap() to update bPWMAP for alloc/free
          * of the extent has been formatted at txLock() time;
@@ -1534,9 +1534,9 @@ static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 }
 
 /*
- *      dataLog()
+ *      dataLog()
  *
- * function:    log data tlock
+ * function:    log data tlock
  */
 static int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
             struct tlock * tlck)
@@ -1580,9 +1580,9 @@ static int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 }
 
 /*
- *      dtLog()
+ *      dtLog()
  *
- * function:    log dtree tlock and format maplock to update bmap;
+ * function:    log dtree tlock and format maplock to update bmap;
  */
 static void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
            struct tlock * tlck)
@@ -1603,10 +1603,10 @@ static void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                 lrd->log.redopage.type |= cpu_to_le16(LOG_BTROOT);
 
         /*
-         *      page extension via relocation: entry insertion;
-         *      page extension in-place: entry insertion;
-         *      new right page from page split, reinitialized in-line
-         *      root from root page split: entry insertion;
+         *      page extension via relocation: entry insertion;
+         *      page extension in-place: entry insertion;
+         *      new right page from page split, reinitialized in-line
+         *      root from root page split: entry insertion;
          */
         if (tlck->type & (tlckNEW | tlckEXTEND)) {
                 /* log after-image of the new page for logredo():
@@ -1641,8 +1641,8 @@ static void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
         }
 
         /*
-         *      entry insertion/deletion,
-         *      sibling page link update (old right page before split);
+         *      entry insertion/deletion,
+         *      sibling page link update (old right page before split);
          */
         if (tlck->type & (tlckENTRY | tlckRELINK)) {
                 /* log after-image for logredo(): */
@@ -1658,11 +1658,11 @@ static void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
         }
 
         /*
-         *      page deletion: page has been invalidated
-         *      page relocation: source extent
+         *      page deletion: page has been invalidated
+         *      page relocation: source extent
          *
-         *      a maplock for free of the page has been formatted
-         *      at txLock() time);
+         *      a maplock for free of the page has been formatted
+         *      at txLock() time);
          */
         if (tlck->type & (tlckFREE | tlckRELOCATE)) {
                 /* log LOG_NOREDOPAGE of the deleted page for logredo()
@@ -1683,9 +1683,9 @@ static void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 }
 
 /*
- *      xtLog()
+ *      xtLog()
  *
- * function:    log xtree tlock and format maplock to update bmap;
+ * function:    log xtree tlock and format maplock to update bmap;
  */
 static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
            struct tlock * tlck)
@@ -1725,8 +1725,8 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
         xadlock = (struct xdlistlock *) maplock;
 
         /*
-         *      entry insertion/extension;
-         *      sibling page link update (old right page before split);
+         *      entry insertion/extension;
+         *      sibling page link update (old right page before split);
          */
         if (tlck->type & (tlckNEW | tlckGROW | tlckRELINK)) {
                 /* log after-image for logredo():
@@ -1801,7 +1801,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
         }
 
         /*
-         *      page deletion: file deletion/truncation (ref. xtTruncate())
+         *      page deletion: file deletion/truncation (ref. xtTruncate())
          *
          * (page will be invalidated after log is written and bmap
          * is updated from the page);
@@ -1908,13 +1908,13 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
         }
 
         /*
-         *      page/entry truncation: file truncation (ref. xtTruncate())
+         *      page/entry truncation: file truncation (ref. xtTruncate())
          *
-         *     |----------+------+------+---------------|
-         *                |      |      |
-         *                |      |     hwm - hwm before truncation
-         *                |     next - truncation point
-         *               lwm - lwm before truncation
+         *      |----------+------+------+---------------|
+         *                 |      |      |
+         *                 |      |     hwm - hwm before truncation
+         *                 |     next - truncation point
+         *                lwm - lwm before truncation
          * header ?
          */
         if (tlck->type & tlckTRUNCATE) {
@@ -1937,7 +1937,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                 twm = xtlck->twm.offset;
 
                 /*
-                 *      write log records
+                 *      write log records
                  */
                 /* log after-image for logredo():
                  *
@@ -1997,7 +1997,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                 }
 
                 /*
-                 *      format maplock(s) for txUpdateMap() to update bmap
+                 *      format maplock(s) for txUpdateMap() to update bmap
                  */
                 maplock->index = 0;
 
@@ -2069,9 +2069,9 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 }
 
 /*
- *      mapLog()
+ *      mapLog()
  *
- * function:    log from maplock of freed data extents;
+ * function:    log from maplock of freed data extents;
  */
 static void mapLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                    struct tlock * tlck)
@@ -2081,7 +2081,7 @@ static void mapLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
         pxd_t *pxd;
 
         /*
-         *      page relocation: free the source page extent
+         *      page relocation: free the source page extent
          *
          * a maplock for txUpdateMap() for free of the page
          * has been formatted at txLock() time saving the src
@@ -2155,10 +2155,10 @@ static void mapLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 }
 
 /*
- *      txEA()
+ *      txEA()
  *
- * function:    acquire maplock for EA/ACL extents or
- *              set COMMIT_INLINE flag;
+ * function:    acquire maplock for EA/ACL extents or
+ *              set COMMIT_INLINE flag;
  */
 void txEA(tid_t tid, struct inode *ip, dxd_t * oldea, dxd_t * newea)
 {
@@ -2207,10 +2207,10 @@ void txEA(tid_t tid, struct inode *ip, dxd_t * oldea, dxd_t * newea)
 }
 
 /*
- *      txForce()
+ *      txForce()
  *
  * function: synchronously write pages locked by transaction
- *              after txLog() but before txUpdateMap();
+ *           after txLog() but before txUpdateMap();
  */
 static void txForce(struct tblock * tblk)
 {
@@ -2273,10 +2273,10 @@ static void txForce(struct tblock * tblk)
 }
 
 /*
- *      txUpdateMap()
+ *      txUpdateMap()
  *
- * function:    update persistent allocation map (and working map
- *              if appropriate);
+ * function:    update persistent allocation map (and working map
+ *              if appropriate);
  *
  * parameter:
  */
@@ -2298,7 +2298,7 @@ static void txUpdateMap(struct tblock * tblk)
 
 
         /*
-         *      update block allocation map
+         *      update block allocation map
          *
          * update allocation state in pmap (and wmap) and
          * update lsn of the pmap page;
@@ -2382,7 +2382,7 @@ static void txUpdateMap(struct tblock * tblk)
                 }
         }
         /*
-         *      update inode allocation map
+         *      update inode allocation map
          *
          * update allocation state in pmap and
          * update lsn of the pmap page;
@@ -2407,24 +2407,24 @@ static void txUpdateMap(struct tblock * tblk)
 }
 
 /*
- *      txAllocPMap()
+ *      txAllocPMap()
  *
  * function: allocate from persistent map;
  *
  * parameter:
- *      ipbmap  -
- *      malock -
- *              xad list:
- *              pxd:
- *
- *      maptype -
- *              allocate from persistent map;
- *              free from persistent map;
- *              (e.g., tmp file - free from working map at releae
- *               of last reference);
- *              free from persistent and working map;
- *
- *      lsn     - log sequence number;
+ *      ipbmap  -
+ *      malock  -
+ *              xad list:
+ *              pxd:
+ *
+ *      maptype -
+ *              allocate from persistent map;
+ *              free from persistent map;
+ *              (e.g., tmp file - free from working map at releae
+ *               of last reference);
+ *              free from persistent and working map;
+ *
+ *      lsn     - log sequence number;
  */
 static void txAllocPMap(struct inode *ip, struct maplock * maplock,
                         struct tblock * tblk)
@@ -2478,9 +2478,9 @@ static void txAllocPMap(struct inode *ip, struct maplock * maplock,
 }
 
 /*
- *      txFreeMap()
+ *      txFreeMap()
  *
- * function:    free from persistent and/or working map;
+ * function:    free from persistent and/or working map;
  *
  * todo: optimization
  */
@@ -2579,9 +2579,9 @@ void txFreeMap(struct inode *ip,
 }
 
 /*
- *      txFreelock()
+ *      txFreelock()
  *
- * function:    remove tlock from inode anonymous locklist
+ * function:    remove tlock from inode anonymous locklist
  */
 void txFreelock(struct inode *ip)
 {
@@ -2619,7 +2619,7 @@ void txFreelock(struct inode *ip)
 }
 
 /*
- *      txAbort()
+ *      txAbort()
  *
  * function: abort tx before commit;
  *
@@ -2679,7 +2679,7 @@ void txAbort(tid_t tid, int dirty)
 }
 
 /*
- *      txLazyCommit(void)
+ *      txLazyCommit(void)
  *
  *      All transactions except those changing ipimap (COMMIT_FORCE) are
  *      processed by this routine.  This insures that the inode and block
@@ -2728,7 +2728,7 @@ static void txLazyCommit(struct tblock * tblk)
 }
 
 /*
- *      jfs_lazycommit(void)
+ *      jfs_lazycommit(void)
  *
  *      To be run as a kernel daemon.  If lbmIODone is called in an interrupt
  *      context, or where blocking is not wanted, this routine will process
@@ -2913,7 +2913,7 @@ void txResume(struct super_block *sb)
 }
 
 /*
- *      jfs_sync(void)
+ *      jfs_sync(void)
  *
  *      To be run as a kernel daemon.  This is awakened when tlocks run low.
  *      We write any inodes that have anonymous tlocks so they will become