linux-next: manual merge of the nfsd tree with Linus' tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jeff Layton <jlayton@redhat.com>
Subject: linux-next: manual merge of the nfsd tree with Linus' tree
Date: Wed, 3 Apr 2013 11:01:08 +1100	[thread overview]
Message-ID: <20130403110108.e669ebda4b5a88550d96a485@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1111 bytes --]

Hi,

Today's linux-next merge of the nfsd tree got a conflict in
fs/nfsd/nfscache.c between commit a517b608fa3d ("nfsd: only unhash DRC
entries that are in the hashtable") from Linus' tree and commit
559aa350587e ("nfsd: track memory utilization in the DRC") from the nfsd
tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/nfsd/nfscache.c
index ca05f6d,3af1767..0000000

--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@@ -100,12 -130,14 +130,15 @@@ nfsd_reply_cache_alloc(void
  static void
  nfsd_reply_cache_free_locked(struct svc_cacherep *rp)
  {
- 	if (rp->c_type == RC_REPLBUFF)
+ 	if (rp->c_type == RC_REPLBUFF && rp->c_replvec.iov_base) {
+ 		drc_mem_usage -= rp->c_replvec.iov_len;
  		kfree(rp->c_replvec.iov_base);
+ 	}
 -	hlist_del(&rp->c_hash);
 +	if (!hlist_unhashed(&rp->c_hash))
 +		hlist_del(&rp->c_hash);
  	list_del(&rp->c_lru);
  	--num_drc_entries;
+ 	drc_mem_usage -= sizeof(*rp);
  	kmem_cache_free(drc_slab, rp);
  }
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
