Subject: linux-next: manual merge of the vfs tree with the nilfs tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 5 Jul 2010 10:02:39 +1000

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/nilfs2/super.c between commit 9fafbf39607e8002f90ca24b74ccd5be5087e50f
("nilfs2: sync super blocks in turns") from the nilfs tree and commit
030c97b8a358cc3d6322b64ecb67adb849e27cd1 ("convert nilfs2 to
->evict_inode()") from the vfs tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc fs/nilfs2/super.c
index 29be735,7c7572a..0000000
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@@ -168,24 -159,7 +168,7 @@@ void nilfs_destroy_inode(struct inode *
  	kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode));
  }
  
- static void nilfs_clear_inode(struct inode *inode)
- {
- 	struct nilfs_inode_info *ii = NILFS_I(inode);
- 
- 	/*
- 	 * Free resources allocated in nilfs_read_inode(), here.
- 	 */
- 	BUG_ON(!list_empty(&ii->i_dirty));
- 	brelse(ii->i_bh);
- 	ii->i_bh = NULL;
- 
- 	if (test_bit(NILFS_I_BMAP, &ii->i_state))
- 		nilfs_bmap_clear(ii->i_bmap);
- 
- 	nilfs_btnode_cache_clear(&ii->i_btnode_cache);
- }
- 
 -static int nilfs_sync_super(struct nilfs_sb_info *sbi, int dupsb)
 +static int nilfs_sync_super(struct nilfs_sb_info *sbi, int flag)
  {
  	struct the_nilfs *nilfs = sbi->s_nilfs;
  	int err;