Merge branch 'xfs-generic-sb-counters' into for-next

Conflicts:
	fs/xfs/xfs_super.c

diff --cc fs/xfs/libxfs/xfs_bmap.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_ialloc.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_sb.c
Simple merge

diff --cc fs/xfs/xfs_super.c
index 58453e3,53c56a9..f32ad64
--- 1/fs/xfs/xfs_super.c
--- 2/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@@ -1505,6 -1558,23 +1538,24 @@@ out_destroy_workqueues
        goto out_free_sb;
  }
  
+ STATIC void
+ xfs_fs_put_super(
+       struct super_block      *sb)
+ {
+       struct xfs_mount        *mp = XFS_M(sb);
+ 
++      xfs_notice(mp, "Unmounting Filesystem");
+       xfs_filestream_unmount(mp);
+       xfs_unmountfs(mp);
+ 
+       xfs_freesb(mp);
+       xfs_destroy_percpu_counters(mp);
+       xfs_destroy_mount_workqueues(mp);
+       xfs_close_devices(mp);
+       xfs_free_fsname(mp);
+       kfree(mp);
+ }
+ 
  STATIC struct dentry *
  xfs_fs_mount(
        struct file_system_type *fs_type,