lkml.org 
[lkml]   [2006]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] 2.6.16-rc-mm4 reiser4 calls try_to_unmap() with 1 arg -- now takes 2
From
Date
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 <lee.schermerhorn@hp.com>

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);


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-02-02 21:19    [W:0.040 / U:0.708 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site