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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Al Viro <viro@zeniv.linux.org.uk>,
	Dave Chinner <dchinner@redhat.com>
Subject: linux-next: manual merge of the akpm tree with the vfs tree
Date: Tue, 10 Sep 2013 14:41:57 +1000	[thread overview]
Message-ID: <20130910144157.c0ae49ee90a23586e1614474@canb.auug.org.au> (raw)

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in fs/super.c
between commit d040790391f2 ("prune_super(): sb->s_op is never NULL")
from the vfs tree and commit "fs: convert inode and dentry shrinking to
be node aware" 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@canb.auug.org.au

diff --cc fs/super.c
index cd3c2cd,efeabe8..0000000

--- a/fs/super.c
+++ b/fs/super.c
@@@ -75,11 -75,11 +75,11 @@@ static unsigned long super_cache_scan(s
  	if (!grab_super_passive(sb))
  		return SHRINK_STOP;
  
 -	if (sb->s_op && sb->s_op->nr_cached_objects)
 +	if (sb->s_op->nr_cached_objects)
- 		fs_objects = sb->s_op->nr_cached_objects(sb);
+ 		fs_objects = sb->s_op->nr_cached_objects(sb, sc->nid);
  
- 	inodes = list_lru_count(&sb->s_inode_lru);
- 	dentries = list_lru_count(&sb->s_dentry_lru);
+ 	inodes = list_lru_count_node(&sb->s_inode_lru, sc->nid);
+ 	dentries = list_lru_count_node(&sb->s_dentry_lru, sc->nid);
  	total_objects = dentries + inodes + fs_objects + 1;
  
  	/* proportion the scan between the caches */

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