From: Ingo Molnar <mingo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Trond Myklebust <trond.myklebust@fys.uio.no>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kirill Tkhai <ktkhai@parallels.com>,
Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the tip tree with the nfs tree
Date: Wed, 24 Sep 2014 09:32:42 +0200 [thread overview]
Message-ID: <20140924073242.GA1962@gmail.com> (raw)
In-Reply-To: <20140922133156.454481f9@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got conflicts in
> fs/nfs/blocklayout/blocklayoutdev.c and
> fs/nfs/blocklayout/blocklayoutdm.c between commit 871760ce97a9
> ("pnfs/blocklayout: move all rpc_pipefs related code into a single
> file") from the nfs tree and commit f139caf2e897 ("sched, cleanup,
> treewide: Remove set_current_state(TASK_RUNNING) after schedule()")
> from the tip tree.
>
> I fixed it up (the former move the code in these two files into
> fs/nfs/blocklayout/rpc_pipefs.c, so I deleted the 2 files and applied
> the following merge fix patch) and can carry the fix as necessary (no
> action is required).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 22 Sep 2014 13:29:19 +1000
> Subject: [PATCH] pnfs: merge fixup for sched cleanup of set_current_state(TASK_RUNNING)
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> fs/nfs/blocklayout/rpc_pipefs.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/fs/nfs/blocklayout/rpc_pipefs.c b/fs/nfs/blocklayout/rpc_pipefs.c
> index 8d04bda2bd2e..e966c023b1b7 100644
> --- a/fs/nfs/blocklayout/rpc_pipefs.c
> +++ b/fs/nfs/blocklayout/rpc_pipefs.c
> @@ -92,7 +92,6 @@ bl_resolve_deviceid(struct nfs_server *server, struct pnfs_block_volume *b,
>
> set_current_state(TASK_UNINTERRUPTIBLE);
> schedule();
> - __set_current_state(TASK_RUNNING);
> remove_wait_queue(&nn->bl_wq, &wq);
>
> if (reply->status != BL_DEVICE_REQUEST_PROC) {
Looks good, thanks Stephen!
Ingo
next prev parent reply other threads:[~2014-09-24 7:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 3:31 linux-next: manual merge of the tip tree with the nfs tree Stephen Rothwell
2014-09-22 7:22 ` Christoph Hellwig
2014-09-24 7:32 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-08-04 7:19 Stephen Rothwell
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=20140924073242.GA1962@gmail.com \
--to=mingo@kernel.org \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=ktkhai@parallels.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=trond.myklebust@fys.uio.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).