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

[Stephen Rothwell]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/xfs/linux-2.6/xfs_super.c between commit 2bcf6e970f5a ("xfs: start
periodic workers later") from the xfs tree and commit d86b98f73104 ("xfs:
make use of new shrinker callout for the inode cache") from the vfs tree.

I fixed it up (I think, see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/xfs/linux-2.6/xfs_super.c
index 25fd2cd,a9c6ccf..0000000
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@@ -1411,9 -1407,7 +1406,7 @@@ xfs_fs_fill_super
  	sb->s_time_gran = 1;
  	set_posix_acl_flag(sb);
  
- 	xfs_inode_shrinker_register(mp);
- 
 -	error = xfs_syncd_init(mp);
 +	error = xfs_mountfs(mp);
  	if (error)
  		goto out_filestream_unmount;
  
@@@ -1438,8 -1432,9 +1431,7 @@@
  
  	return 0;
  
 - out_syncd_stop:
 -	xfs_syncd_stop(mp);
   out_filestream_unmount:
- 	xfs_inode_shrinker_unregister(mp);
  	xfs_filestream_unmount(mp);
   out_free_sb:
  	xfs_freesb(mp);
@@@ -1453,12 -1448,16 +1445,11 @@@
   out:
  	return -error;
  
 - fail_vnrele:
 -	if (sb->s_root) {
 -		dput(sb->s_root);
 -		sb->s_root = NULL;
 -	} else {
 -		iput(root);
 -	}
 -
 - fail_unmount:
 + out_iput:
 +	iput(root);
 + out_syncd_stop:
  	xfs_syncd_stop(mp);
 + out_unmount:
- 	xfs_inode_shrinker_unregister(mp);
  
  	/*
  	 * Blow away any referenced inode in the filestreams cache.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/