From: Stephen Rothwell <sfr@canb•auug.org.au>
To: 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>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Weston Andros Adamson <dros@primarydata•com>,
NeilBrown <neilb@suse•de>
Subject: linux-next: manual merge of the tip tree with the nfs tree
Date: Mon, 4 Aug 2014 17:19:06 +1000 [thread overview]
Message-ID: <20140804171906.2c2b4470@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 993 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
fs/nfs/pagelist.c between commit e7029206ff43 ("nfs: check
wait_on_bit_lock err in page_group_lock") from the nfs tree and commit
743162013d40 ("sched: Remove proliferation of wait_on_bit() action
functions") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/nfs/pagelist.c
index 9425118e91d7,0be5050638f7..000000000000
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@@ -158,14 -149,8 +152,13 @@@ nfs_page_group_lock(struct nfs_page *re
WARN_ON_ONCE(head != head->wb_head);
- wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,
+ do {
+ ret = wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,
- nfs_wait_bit_uninterruptible,
TASK_UNINTERRUPTIBLE);
+ } while (wait && ret != 0);
+
+ WARN_ON_ONCE(ret > 0);
+ return ret;
}
/*
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-08-04 7:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-04 7:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
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
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=20140804171906.2c2b4470@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dros@primarydata$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=neilb@suse$(echo .)de \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=trond.myklebust@fys$(echo .)uio.no \
/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