[XFS] kill the vfs_fsid and vfs_altfsid members in struct bhv_vfs

vfs_altfsid was just a pointer to mp->m_fixedfsid so we can trivially
replace it with the latter. vfs_fsid also was identical to m_fixedfsid
through rather obfuscated ways so we can kill it as well and simply its
only user.

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29506a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 7 insertions, 13 deletions

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 339f9d4a49cd..a4634d94e561 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -133,10 +133,14 @@ xfs_errortag_add(int error_tag, xfs_mount_t *mp)
 }
 
 int
-xfs_errortag_clearall_umount(int64_t fsid, char *fsname, int loud)
+xfs_errortag_clearall(xfs_mount_t *mp, int loud)
 {
-        int i;
+        int64_t fsid;
         int cleared = 0;
+        int i;
+
+        memcpy(&fsid, mp->m_fixedfsid, sizeof(xfs_fsid_t));
+
 
         for (i = 0; i < XFS_NUM_INJECT_ERROR; i++) {
                 if ((fsid == 0LL || xfs_etest_fsid[i] == fsid) &&
@@ -155,20 +159,10 @@ xfs_errortag_clearall_umount(int64_t fsid, char *fsname, int loud)
         if (loud || cleared)
                 cmn_err(CE_WARN,
                         "Cleared all XFS error tags for filesystem \"%s\"",
-                        fsname);
+                        mp->m_fsname);
 
         return 0;
 }
-
-int
-xfs_errortag_clearall(xfs_mount_t *mp)
-{
-        int64_t fsid;
-
-        memcpy(&fsid, mp->m_fixedfsid, sizeof(xfs_fsid_t));
-
-        return xfs_errortag_clearall_umount(fsid, mp->m_fsname, 1);
-}
 #endif /* DEBUG || INDUCE_IO_ERROR */
 
 static void