From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Schermerhorn Subject: [PATCH] 2.6.16-rc-mm4 reiser4 calls try_to_unmap() with 1 arg -- now takes 2 Date: Thu, 02 Feb 2006 15:16:15 -0500 Message-ID: <1138911375.5204.31.camel@localhost.localdomain> Reply-To: lee.schermerhorn@hp.com Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from ccerelbas03.cce.hp.com ([161.114.21.106]:40085 "EHLO ccerelbas03.cce.hp.com") by vger.kernel.org with ESMTP id S932207AbWBBUQd (ORCPT ); Thu, 2 Feb 2006 15:16:33 -0500 To: linux-kernel , linux-fsdevel@vger.kernel.org Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Apparent race between reiser4 and direct migration patches in 16-rc1- mm4. Direct migration added arg to rmap.c:try_to_unmap()--int ignore_refs-- and fixed up existing refs. reiser4 adds new call with single arg. One doesn't see this when building mm4 w/ reiser4 because the ref under an "#if REISER4_COPY_ON_CAPTURE" that is apparently not enabled. I just noticed it while looking at direct migration patches. So, this patch is essentially UNTESTED. Supplied simply to illustrate the location of the single arg ref. Signed-off-by: Lee Schermerhorn Index: linux-2.6.16-rc1-mm4/fs/reiser4/txnmgr.c =================================================================== --- linux-2.6.16-rc1-mm4.orig/fs/reiser4/txnmgr.c 2006-01-31 16:51:39.000000000 -0500 +++ linux-2.6.16-rc1-mm4/fs/reiser4/txnmgr.c 2006-02-02 14:43:01.659744418 -0500 @@ -3693,7 +3693,7 @@ static int create_copy_and_replace(jnode pte_chain_lock(page); if (page_mapped(page)) { - result = try_to_unmap(page); + result = try_to_unmap(page, 0); if (result == SWAP_AGAIN) { result = RETERR(-E_REPEAT);