* When a reentered fs function reuses a transaction of its caller, the

Transaction::UnlockInodes() method was never called, leading to bug #4155.
* In order to make sure that inodes are still going to be reverted, we actually
  need to move them into the parent transaction which we now do. This should
  fix #4155.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31952 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/kernel/file_systems/bfs/Journal.cpp

@@ -1006,7 +1006,8 @@ Journal::Unlock(Transaction* owner, bool success)
 		if (fSeparateSubTransactions
 			&& recursive_lock_get_recursion(&fLock) == 1)
 			fSeparateSubTransactions = false;
-	}
+	} else
+		owner->MoveInodesTo(fOwner);
 
 	recursive_lock_unlock(&fLock);
 	return B_OK;
@@ -1202,3 +1203,14 @@ Transaction::UnlockInodes(bool success)
 	}
 }
 
+
+/*!	Move the inodes into the parent transaction. This is needed only to make
+	sure they will still be reverted in case the transaction is aborted.
+*/
+void
+Transaction::MoveInodesTo(Transaction* transaction)
+{
+	while (Inode* inode = fLockedInodes.RemoveHead()) {
+		transaction->fLockedInodes.Add(inode);
+	}
+}

src/add-ons/kernel/file_systems/bfs/Journal.h

@@ -180,6 +180,7 @@ public:
 	void RemoveInode(Inode* inode);
 
 	void UnlockInodes(bool success);
+	void MoveInodesTo(Transaction* transaction);
 
 private:
 	Transaction(const Transaction& other);