From: Dave Chinner <david@fromorbit.com>
Date: Mon, 23 Feb 2015 23:27:28 +0000 (+1100)
Subject: Merge branch 'xfs-generic-sb-counters' into for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4225441a1eec45241efe529d23403d8ca3d1d71b;p=linux-beck.git

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

Conflicts:
	fs/xfs/xfs_super.c
---

4225441a1eec45241efe529d23403d8ca3d1d71b
diff --cc fs/xfs/xfs_super.c
index 58453e3255f8,53c56a913778..f32ad64c4d05
--- a/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,