Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  JFS: commit_mutex cleanups

diff --combined fs/jfs/jfs_txnmgr.c
index 10c4623,49618dd..efbb586
--- 1/fs/jfs/jfs_txnmgr.c
--- 2/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@@ -842,7 -842,7 +842,7 @@@ struct tlock *txLock(tid_t tid, struct 
        TXN_UNLOCK();
        release_metapage(mp);
        TXN_LOCK();
 -      xtid = tlck->tid;       /* reaquire after dropping TXN_LOCK */
 +      xtid = tlck->tid;       /* reacquire after dropping TXN_LOCK */
  
        jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d",
                 tid, xtid, lid);
@@@ -2944,7 -2944,7 +2944,7 @@@ int jfs_sync(void *arg
                                 * Inode is being freed
                                 */
                                list_del_init(&jfs_ip->anon_inode_list);
-                       } else if (! !mutex_trylock(&jfs_ip->commit_mutex)) {
+                       } else if (mutex_trylock(&jfs_ip->commit_mutex)) {
                                /*
                                 * inode will be removed from anonymous list
                                 * when it is committed