From: "Myklebust, Trond" <Trond.Myklebust@netapp•com>
To: Mel Gorman <mgorman@suse•de>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Andrew Morton <akpm@linux-foundation•org>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
Jeff Layton <jlayton@redhat•com>
Subject: Re: linux-next: manual merge of the akpm tree with the nfs tree
Date: Tue, 31 Jul 2012 14:37:24 +0000 [thread overview]
Message-ID: <1343745442.519.20.camel@lade.trondhjem.org> (raw)
In-Reply-To: <20120731103336.GN612@suse.de>
On Tue, 2012-07-31 at 11:33 +0100, Mel Gorman wrote:
> On Tue, Jul 31, 2012 at 02:24:41PM +1000, Stephen Rothwell wrote:
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in
> > net/sunrpc/xprtsock.c between commit 5cf02d09b50b ("nfs: skip commit in
> > releasepage if we're freeing memory for fs-related reasons") from the nfs
> > tree and commit "nfs: enable swap on NFS" from the akpm tree.
> >
> > Just context changes? I fixed it up (I think - see below) and can carry
> > the fix as necessary.
>
> Functionally it looks fine. As you say, it all looks like context
> changes. Arguably code like this
>
> current->flags &= ~PF_FSTRANS
>
> could use tsk_restore_flags instead() even though it should never be
> necessary as PF_FSTRANS would not be set on function entry. However,
> it would set up a depedency between the patch sets that is undesirable.
> If both sets get merged then it might make sense as a cleanup to use
> tsk_restore_flags() but not until then.
>
> Thanks Stephen.
>
Do we really need to set both PF_FSTRANS and PF_MEMALLOC here? The
reason why I merged the PF_FSTRANS patch is that we have the deadlock
problem when allocating a new socket even before we add swap-over-nfs.
Adding PF_FSTRANS to disallow entry into the NFS layer by the memory
allocator fixes that issue.
What value does PF_MEMALLOC add? Is that in order to prevent recursion
into other areas of the swap code (say, if you mix swap-over-nfs with
ordinary swap-to-disk)?
Cheers
Trond
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp•com
www.netapp.com
next prev parent reply other threads:[~2012-07-31 14:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 4:24 linux-next: manual merge of the akpm tree with the nfs tree Stephen Rothwell
2012-07-31 10:33 ` Mel Gorman
2012-07-31 14:37 ` Myklebust, Trond [this message]
2012-07-31 15:19 ` Mel Gorman
2012-07-31 15:35 ` Myklebust, Trond
2012-07-31 17:50 ` Mel Gorman
2012-07-31 18:44 ` Andrew Morton
2012-07-31 19:00 ` Myklebust, Trond
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343745442.519.20.camel@lade.trondhjem.org \
--to=trond.myklebust@netapp$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jlayton@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mgorman@suse$(echo .)de \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox