linux-next: manual merge of the akpm tree with the nfsd tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/nfsd/nfscache.c between commit 2c6b691c05bf ("nfsd: when updating an
entry with RC_NOCACHE, just free it") from the nfsd tree and commit
"hlist: drop the node parameter from iterators" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/nfsd/nfscache.c
index d16a5d6,30c27eb..0000000
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@@ -254,9 -165,11 +253,9 @@@ nfsd_cache_search(struct svc_rqst *rqst
  				proc = rqstp->rq_proc;
  
  	rh = &cache_hash[request_hash(xid)];
- 	hlist_for_each_entry(rp, hn, rh, c_hash) {
+ 	hlist_for_each_entry(rp, rh, c_hash) {
 -		if (rp->c_state != RC_UNUSED &&
 -		    xid == rp->c_xid && proc == rp->c_proc &&
 +		if (xid == rp->c_xid && proc == rp->c_proc &&
  		    proto == rp->c_prot && vers == rp->c_vers &&
 -		    !nfsd_cache_entry_expired(rp) &&
  		    rpc_cmp_addr(svc_addr(rqstp), (struct sockaddr *)&rp->c_addr) &&
  		    rpc_get_port(svc_addr(rqstp)) == rpc_get_port((struct sockaddr *)&rp->c_addr))
  			return rp;

Attachment: pgp00000.pgp
Description: PGP signature