Commit e1fdc381 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://jfs.bkbits.net/linux-2.5

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 6b4e4b90 309811e3
...@@ -2977,11 +2977,12 @@ int jfs_sync(void *arg) ...@@ -2977,11 +2977,12 @@ int jfs_sync(void *arg)
anon_inode_list); anon_inode_list);
ip = &jfs_ip->vfs_inode; ip = &jfs_ip->vfs_inode;
if (! igrab(ip)) {
/* /*
* down_trylock returns 0 on success. This is * Inode is being freed
* inconsistent with spin_trylock.
*/ */
if (! down_trylock(&jfs_ip->commit_sem)) { list_del_init(&jfs_ip->anon_inode_list);
} else if (! down_trylock(&jfs_ip->commit_sem)) {
/* /*
* inode will be removed from anonymous list * inode will be removed from anonymous list
* when it is committed * when it is committed
...@@ -2991,6 +2992,8 @@ int jfs_sync(void *arg) ...@@ -2991,6 +2992,8 @@ int jfs_sync(void *arg)
rc = txCommit(tid, 1, &ip, 0); rc = txCommit(tid, 1, &ip, 0);
txEnd(tid); txEnd(tid);
up(&jfs_ip->commit_sem); up(&jfs_ip->commit_sem);
iput(ip);
/* /*
* Just to be safe. I don't know how * Just to be safe. I don't know how
* long we can run without blocking * long we can run without blocking
...@@ -3010,6 +3013,10 @@ int jfs_sync(void *arg) ...@@ -3010,6 +3013,10 @@ int jfs_sync(void *arg)
/* Put on anon_list2 */ /* Put on anon_list2 */
list_add(&jfs_ip->anon_inode_list, list_add(&jfs_ip->anon_inode_list,
&TxAnchor.anon_list2); &TxAnchor.anon_list2);
TXN_UNLOCK();
iput(ip);
TXN_LOCK();
} }
} }
/* Add anon_list2 back to anon_list */ /* Add anon_list2 back to anon_list */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment