diff options
author | Christoph Hellwig <hch@lst.de> | 2008-12-03 06:20:37 -0500 |
---|---|---|
committer | Niv Sardi <xaiki@sgi.com> | 2008-12-03 23:39:24 -0500 |
commit | f95099ba5ae06b96a9c17ef93cc655f686d79077 (patch) | |
tree | 000e5aa4db7386439cbe1d932d7639978a7c87c0 /fs/xfs/linux-2.6/xfs_super.c | |
parent | e57481dc269cd3773b22f53bfb869308780a7bf1 (diff) |
kill xfs_unmount_flush
There's almost nothing left in this function, instead remove the IRELE
on the real times inodes and the call to XFS_QM_UNMOUNT into xfs_unmountfs.
For the regular unmount case that means it now also happenes after dmapi
notification, but otherwise there is no difference in behaviour.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_super.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index c4f788e11197..4ebbd6820e7f 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
@@ -1043,7 +1043,6 @@ xfs_fs_put_super( | |||
1043 | struct xfs_mount *mp = XFS_M(sb); | 1043 | struct xfs_mount *mp = XFS_M(sb); |
1044 | struct xfs_inode *rip = mp->m_rootip; | 1044 | struct xfs_inode *rip = mp->m_rootip; |
1045 | int unmount_event_flags = 0; | 1045 | int unmount_event_flags = 0; |
1046 | int error; | ||
1047 | 1046 | ||
1048 | xfs_syncd_stop(mp); | 1047 | xfs_syncd_stop(mp); |
1049 | xfs_sync_inodes(mp, SYNC_ATTR|SYNC_DELWRI); | 1048 | xfs_sync_inodes(mp, SYNC_ATTR|SYNC_DELWRI); |
@@ -1071,8 +1070,6 @@ xfs_fs_put_super( | |||
1071 | xfs_filestream_unmount(mp); | 1070 | xfs_filestream_unmount(mp); |
1072 | 1071 | ||
1073 | XFS_bflush(mp->m_ddev_targp); | 1072 | XFS_bflush(mp->m_ddev_targp); |
1074 | error = xfs_unmount_flush(mp, 0); | ||
1075 | WARN_ON(error); | ||
1076 | 1073 | ||
1077 | if (mp->m_flags & XFS_MOUNT_DMAPI) { | 1074 | if (mp->m_flags & XFS_MOUNT_DMAPI) { |
1078 | XFS_SEND_UNMOUNT(mp, rip, DM_RIGHT_NULL, 0, 0, | 1075 | XFS_SEND_UNMOUNT(mp, rip, DM_RIGHT_NULL, 0, 0, |
@@ -1535,8 +1532,6 @@ xfs_fs_fill_super( | |||
1535 | xfs_filestream_unmount(mp); | 1532 | xfs_filestream_unmount(mp); |
1536 | 1533 | ||
1537 | XFS_bflush(mp->m_ddev_targp); | 1534 | XFS_bflush(mp->m_ddev_targp); |
1538 | error = xfs_unmount_flush(mp, 0); | ||
1539 | WARN_ON(error); | ||
1540 | 1535 | ||
1541 | xfs_unmountfs(mp); | 1536 | xfs_unmountfs(mp); |
1542 | goto out_free_sb; | 1537 | goto out_free_sb; |