Skip to contentSkip to conversation

2.6.16-rc-mm4 reiser4 calls try_to_unmap() with 1 arg -- now takes 2

PATCH In review Lee Schermerhorn 2 participants 3 messages Feb 2, 2006 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 2.6.16-rc-mm4 reiser4 calls try_to_unmap() with 1 arg -- now takes 2

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.

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

#1 lore raw
Quoted 6 lines · Lee Schermerhorn

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.

Quoted 7 lines

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

That's worrying code to find down in a filesystem. But never mind, it refers to pte_chain_lock(), which hasn't existed since 2.6.5. So REISER4_COPY_ON_CAPTURE is long untested and should just be deleted.

Hugh

Quoted 17 lines

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

(quoted diff) +1 -1
@@ -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);
#2 lore raw
Quoted 16 lines · Hugh Dickins
Quoted 6 lines · Lee Schermerhorn

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.

Quoted 7 lines

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

Quoted 5 lines

That's worrying code to find down in a filesystem. But never mind, it refers to pte_chain_lock(), which hasn't existed since 2.6.5. So REISER4_COPY_ON_CAPTURE is long untested and should just be deleted.

Hugh

OK. I had a 16-rc1-mm4 build problem earlier because of a similar patch race between an SGI patch bundle and one of gregkh's patches [ATE_MAKE() arg changes], so I just wanted to give folks a heads up.

Thanks for the response.

Lee

Quoted 19 lines
Quoted 18 lines

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

(quoted diff) +1 -1
@@ -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);