* linux-next: manual merge of the pm tree with the xfs tree
@ 2011-12-19 4:11 Stephen Rothwell
2011-12-19 5:01 ` Dave Chinner
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-12-19 4:11 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, linux-kernel, Tejun Heo, Eric Sandeen, Ben Myers,
David Chinner, xfs-masters
[-- Attachment #1: Type: text/plain, Size: 1004 bytes --]
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
fs/xfs/xfs_buf.c between commit 687d1c5e8e26 ("xfs: remove unused
XBT_FORCE_SLEEP bit") from the xfs tree and commit a0acae0e886d
("freezer: unexport refrigerator() and update try_to_freeze() slightly")
from the pm tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/xfs/xfs_buf.c
index f84777e,0188299..0000000
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@@ -1701,8 -1701,12 +1701,8 @@@ xfsbufd
struct list_head tmp;
struct blk_plug plug;
- if (unlikely(freezing(current))) {
- set_bit(XBT_FORCE_SLEEP, &target->bt_flags);
+ if (unlikely(freezing(current)))
- refrigerator();
+ try_to_freeze();
- } else {
- clear_bit(XBT_FORCE_SLEEP, &target->bt_flags);
- }
/* sleep for a long time if there is nothing to do. */
if (list_empty(&target->bt_delwri_queue))
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the pm tree with the xfs tree
2011-12-19 4:11 linux-next: manual merge of the pm tree with the xfs tree Stephen Rothwell
@ 2011-12-19 5:01 ` Dave Chinner
0 siblings, 0 replies; 2+ messages in thread
From: Dave Chinner @ 2011-12-19 5:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rafael J. Wysocki, linux-next, linux-kernel, Tejun Heo,
Eric Sandeen, Ben Myers, xfs-masters
On Mon, Dec 19, 2011 at 03:11:45PM +1100, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> fs/xfs/xfs_buf.c between commit 687d1c5e8e26 ("xfs: remove unused
> XBT_FORCE_SLEEP bit") from the xfs tree and commit a0acae0e886d
> ("freezer: unexport refrigerator() and update try_to_freeze() slightly")
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks correct from the XFS POV, Stephen. Thanks.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-19 5:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-19 4:11 linux-next: manual merge of the pm tree with the xfs tree Stephen Rothwell
2011-12-19 5:01 ` Dave Chinner
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).