[XFS] kill xfs_freeze.

[linux-2.6] / fs / xfs / xfs_vfsops.c

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 0f237f9f0c3a08fe49468262e2623672a097f4e9..fd4a0dfc599fae0b5c497e1e63ee69e9a5a8d7d0 100644 (file)
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -67,8 +67,8 @@ xfs_init(void)
        extern kmem_zone_t      *xfs_buf_item_zone;
        extern kmem_zone_t      *xfs_dabuf_zone;
 #ifdef XFS_DABUF_DEBUG
-       extern lock_t           xfs_dabuf_global_lock;
-       spinlock_init(&xfs_dabuf_global_lock, "xfsda");
+       extern spinlock_t        xfs_dabuf_global_lock;
+       spin_lock_init(&xfs_dabuf_global_lock);
 #endif
 
        /*
@@ -449,8 +449,6 @@ xfs_mount(
        if (error)
                return error;
 
-       mp->m_io_ops = xfs_iocore_xfs;
-
        if (args->flags & XFSMNT_QUIET)
                flags |= XFS_MFSI_QUIET;
 
@@ -544,7 +542,7 @@ xfs_mount(
        if ((error = xfs_filestream_mount(mp)))
                goto error2;
 
-       error = XFS_IOINIT(mp, args, flags);
+       error = xfs_mountfs(mp, flags);
        if (error)
                goto error2;
 
@@ -694,7 +692,7 @@ xfs_quiesce_fs(
  * care of the metadata. New transactions are already blocked, so we need to
  * wait for any remaining transactions to drain out before proceding.
  */
-STATIC void
+void
 xfs_attr_quiesce(
        xfs_mount_t     *mp)
 {
@@ -840,60 +838,6 @@ xfs_root(
        return 0;
 }
 
-/*
- * xfs_statvfs
- *
- * Fill in the statvfs structure for the given file system.  We use
- * the superblock lock in the mount structure to ensure a consistent
- * snapshot of the counters returned.
- */
-int
-xfs_statvfs(
-       xfs_mount_t     *mp,
-       bhv_statvfs_t   *statp,
-       bhv_vnode_t     *vp)
-{
-       __uint64_t      fakeinos;
-       xfs_extlen_t    lsize;
-       xfs_sb_t        *sbp;
-       unsigned long   s;
-
-       sbp = &(mp->m_sb);
-
-       statp->f_type = XFS_SB_MAGIC;
-
-       xfs_icsb_sync_counters_flags(mp, XFS_ICSB_LAZY_COUNT);
-       s = XFS_SB_LOCK(mp);
-       statp->f_bsize = sbp->sb_blocksize;
-       lsize = sbp->sb_logstart ? sbp->sb_logblocks : 0;
-       statp->f_blocks = sbp->sb_dblocks - lsize;
-       statp->f_bfree = statp->f_bavail =
-                               sbp->sb_fdblocks - XFS_ALLOC_SET_ASIDE(mp);
-       fakeinos = statp->f_bfree << sbp->sb_inopblog;
-#if XFS_BIG_INUMS
-       fakeinos += mp->m_inoadd;
-#endif
-       statp->f_files =
-           MIN(sbp->sb_icount + fakeinos, (__uint64_t)XFS_MAXINUMBER);
-       if (mp->m_maxicount)
-#if XFS_BIG_INUMS
-               if (!mp->m_inoadd)
-#endif
-                       statp->f_files = min_t(typeof(statp->f_files),
-                                               statp->f_files,
-                                               mp->m_maxicount);
-       statp->f_ffree = statp->f_files - (sbp->sb_icount - sbp->sb_ifree);
-       XFS_SB_UNLOCK(mp, s);
-
-       xfs_statvfs_fsid(statp, mp);
-       statp->f_namelen = MAXNAMELEN - 1;
-
-       if (vp)
-               XFS_QM_DQSTATVFS(xfs_vtoi(vp), statp);
-       return 0;
-}
-
-
 /*
  * xfs_sync flushes any pending I/O to file system vfsp.
  *
@@ -1958,16 +1902,3 @@ xfs_showargs(
                seq_puts(m, "," MNTOPT_DMAPI);
        return 0;
 }
-
-/*
- * Second stage of a freeze. The data is already frozen so we only
- * need to take care of themetadata. Once that's done write a dummy
- * record to dirty the log in case of a crash while frozen.
- */
-void
-xfs_freeze(
-       xfs_mount_t     *mp)
-{
-       xfs_attr_quiesce(mp);
-       xfs_fs_log_dummy(mp);
-}