From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Aug 2014 00:13:19 +0000 (-0600)
Subject: Merge tag 'nfs-for-3.17-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=06b8ab55289345ab191bf4bf0e4acc6d4bdf293d;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'nfs-for-3.17-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client updates from Trond Myklebust:
 "Highlights include:

   - stable fix for a bug in nfs3_list_one_acl()
   - speed up NFS path walks by supporting LOOKUP_RCU
   - more read/write code cleanups
   - pNFS fixes for layout return on close
   - fixes for the RCU handling in the rpcsec_gss code
   - more NFS/RDMA fixes"

* tag 'nfs-for-3.17-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (79 commits)
  nfs: reject changes to resvport and sharecache during remount
  NFS: Avoid infinite loop when RELEASE_LOCKOWNER getting expired error
  SUNRPC: remove all refcounting of groupinfo from rpcauth_lookupcred
  NFS: fix two problems in lookup_revalidate in RCU-walk
  NFS: allow lockless access to access_cache
  NFS: teach nfs_lookup_verify_inode to handle LOOKUP_RCU
  NFS: teach nfs_neg_need_reval to understand LOOKUP_RCU
  NFS: support RCU_WALK in nfs_permission()
  sunrpc/auth: allow lockless (rcu) lookup of credential cache.
  NFS: prepare for RCU-walk support but pushing tests later in code.
  NFS: nfs4_lookup_revalidate: only evaluate parent if it will be used.
  NFS: add checks for returned value of try_module_get()
  nfs: clear_request_commit while holding i_lock
  pnfs: add pnfs_put_lseg_async
  pnfs: find swapped pages on pnfs commit lists too
  nfs: fix comment and add warn_on for PG_INODE_REF
  nfs: check wait_on_bit_lock err in page_group_lock
  sunrpc: remove "ec" argument from encrypt_v2 operation
  sunrpc: clean up sparse endianness warnings in gss_krb5_wrap.c
  sunrpc: clean up sparse endianness warnings in gss_krb5_seal.c
  ...
---

06b8ab55289345ab191bf4bf0e4acc6d4bdf293d
diff --cc fs/nfs/pagelist.c
index 0be5050638f7,9425118e91d7..ba491926df5f
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@@ -149,8 -158,14 +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;
  }
  
  /*