vserver 1.9.5.x5

[linux-2.6.git] / fs / jfs / jfs_txnmgr.c

diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index f4bd79b..1d870dc 100644 (file)
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -80,7 +80,7 @@ static struct {
 int jfs_tlocks_low;            /* Indicates low number of available tlocks */
 
 #ifdef CONFIG_JFS_STATISTICS
-struct {
+static struct {
        uint txBegin;
        uint txBegin_barrier;
        uint txBegin_lockslow;
@@ -113,7 +113,7 @@ struct tlock *TxLock;           /* transaction lock table */
 /*
  *      transaction management lock
  */
-static spinlock_t jfsTxnLock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(jfsTxnLock);
 
 #define TXN_LOCK()              spin_lock(&jfsTxnLock)
 #define TXN_UNLOCK()            spin_unlock(&jfsTxnLock)
@@ -152,7 +152,7 @@ static inline void TXN_SLEEP_DROP_LOCK(wait_queue_head_t * event)
 /*
  *      statistics
  */
-struct {
+static struct {
        tid_t maxtid;           /* 4: biggest tid ever used */
        lid_t maxlid;           /* 4: biggest lid ever used */
        int ntid;               /* 4: # of transactions performed */
@@ -165,7 +165,6 @@ struct {
  * external references
  */
 extern int lmGroupCommit(struct jfs_log *, struct tblock *);
-extern void lmSync(struct jfs_log *);
 extern int jfs_commit_inode(struct inode *, int);
 extern int jfs_stop_threads;
 
@@ -2622,8 +2621,6 @@ void txAbort(tid_t tid, int dirty)
        struct tblock *tblk = tid_to_tblock(tid);
        struct tlock *tlck;
 
-       jfs_warn("txAbort: tid:%d dirty:0x%x", tid, dirty);
-
        /*
         * free tlocks of the transaction
         */