* [PATCH] 2.6.16-rc-mm4 reiser4 calls try_to_unmap() with 1 arg -- now takes 2
@ 2006-02-02 20:16 Lee Schermerhorn
2006-02-02 20:46 ` Hugh Dickins
0 siblings, 1 reply; 3+ messages in thread
From: Lee Schermerhorn @ 2006-02-02 20:16 UTC (permalink / raw)
To: linux-kernel, linux-fsdevel
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);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] 2.6.16-rc-mm4 reiser4 calls try_to_unmap() with 1 arg -- now takes 2
2006-02-02 20:16 [PATCH] 2.6.16-rc-mm4 reiser4 calls try_to_unmap() with 1 arg -- now takes 2 Lee Schermerhorn
@ 2006-02-02 20:46 ` Hugh Dickins
2006-02-02 20:54 ` Lee Schermerhorn
0 siblings, 1 reply; 3+ messages in thread
From: Hugh Dickins @ 2006-02-02 20:46 UTC (permalink / raw)
To: Lee Schermerhorn; +Cc: linux-kernel, linux-fsdevel
On Thu, 2 Feb 2006, Lee Schermerhorn wrote:
> 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
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
>
> 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);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] 2.6.16-rc-mm4 reiser4 calls try_to_unmap() with 1 arg -- now takes 2
2006-02-02 20:46 ` Hugh Dickins
@ 2006-02-02 20:54 ` Lee Schermerhorn
0 siblings, 0 replies; 3+ messages in thread
From: Lee Schermerhorn @ 2006-02-02 20:54 UTC (permalink / raw)
To: Hugh Dickins; +Cc: linux-kernel, linux-fsdevel
On Thu, 2006-02-02 at 20:46 +0000, Hugh Dickins wrote:
> On Thu, 2 Feb 2006, Lee Schermerhorn wrote:
>
> > 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
>
> 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
>
> >
> > 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);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-02-02 20:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-02-02 20:16 [PATCH] 2.6.16-rc-mm4 reiser4 calls try_to_unmap() with 1 arg -- now takes 2 Lee Schermerhorn
2006-02-02 20:46 ` Hugh Dickins
2006-02-02 20:54 ` Lee Schermerhorn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).