diff options
author | Linus Torvalds | 2006-07-15 23:43:30 +0200 |
---|---|---|
committer | Linus Torvalds | 2006-07-15 23:43:30 +0200 |
commit | b20e481ab595e9667c33e2393bdfe9a31870d11f (patch) | |
tree | 0ffd17e1f9704b49ba6e90ddef49c94e6b191d89 /fs/jfs/jfs_txnmgr.c | |
parent | [PATCH] UML - fix utsname build breakage (diff) | |
parent | JFS: commit_mutex cleanups (diff) | |
download | kernel-qcow2-linux-b20e481ab595e9667c33e2393bdfe9a31870d11f.tar.gz kernel-qcow2-linux-b20e481ab595e9667c33e2393bdfe9a31870d11f.tar.xz kernel-qcow2-linux-b20e481ab595e9667c33e2393bdfe9a31870d11f.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
JFS: commit_mutex cleanups
Diffstat (limited to 'fs/jfs/jfs_txnmgr.c')
-rw-r--r-- | fs/jfs/jfs_txnmgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index 10c46231ce15..efbb586bed4b 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c @@ -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 |