VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index f48fdea..f4bd79b 100644 (file)
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -330,9 +330,9 @@ int txInit(void)
 void txExit(void)
 {
        vfree(TxLock);
-       TxLock = 0;
+       TxLock = NULL;
        vfree(TxBlock);
-       TxBlock = 0;
+       TxBlock = NULL;
 }
 
 
@@ -1554,7 +1554,7 @@ static int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                hold_metapage(mp, 0);
                atomic_dec(&mp->nohomeok);
                discard_metapage(mp);
-               tlck->mp = 0;
+               tlck->mp = NULL;
                return 0;
        }
 
@@ -2270,7 +2270,7 @@ static void txUpdateMap(struct tblock * tblk)
        struct pxd_lock pxdlock;
        int maptype;
        int k, nlock;
-       struct metapage *mp = 0;
+       struct metapage *mp = NULL;
 
        ipimap = JFS_SBI(tblk->sb)->ipimap;
 
@@ -2358,7 +2358,7 @@ static void txUpdateMap(struct tblock * tblk)
                        assert(atomic_read(&mp->nohomeok) == 1);
                        atomic_dec(&mp->nohomeok);
                        discard_metapage(mp);
-                       tlck->mp = 0;
+                       tlck->mp = NULL;
                }
        }
        /*
@@ -2580,7 +2580,7 @@ void txFreelock(struct inode *ip)
        TXN_LOCK();
        xtlck = (struct tlock *) &jfs_ip->atlhead;
 
-       while ((lid = xtlck->next)) {
+       while ((lid = xtlck->next) != 0) {
                tlck = lid_to_tlock(lid);
                if (tlck->flag & tlckFREELOCK) {
                        xtlck->next = tlck->next;