linux-kernel - linux-next: manual merge of the tip tree with the nfs 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>] [day] [month] [year] [list]

Message-ID: <20140804171906.2c2b4470@canb.auug.org.au>
Date:	Mon, 4 Aug 2014 17:19:06 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Trond Myklebust <trond.myklebust@....uio.no>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Weston Andros Adamson <dros@...marydata.com>,
	NeilBrown <neilb@...e.de>
Subject: linux-next: manual merge of the tip tree with the nfs tree

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@...b.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;
  }
  
  /*

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)