linux-kernel - linux-next: manual merge of the pm tree with the xfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20111219151145.dba82854f65671a877db8ed3@canb.auug.org.au>
Date:	Mon, 19 Dec 2011 15:11:45 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Rafael J. Wysocki" <rjw@...k.pl>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>, Eric Sandeen <sandeen@...deen.net>,
	Ben Myers <bpm@....com>, David Chinner <david@...morbit.com>,
	xfs-masters@....sgi.com
Subject: linux-next: manual merge of the pm tree with the xfs tree

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@...b.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))

Content of type "application/pgp-signature" skipped