diff options
author | Nathan Scott <nathans@bruce> | 2006-03-21 22:12:12 -0500 |
---|---|---|
committer | Nathan Scott <nathans@bruce> | 2006-03-21 22:12:12 -0500 |
commit | bb19fba1937cb6ab2bb98ac893365f6ebf88ef1b (patch) | |
tree | ef24ffdf7903206c4bc0432ce91d2627bffdf714 /fs/xfs/linux-2.6 | |
parent | e15f195cfb2fb1f2af0fdfc21277643deb26c0df (diff) |
[XFS] Sync up one/two other minor changes missed in previous merges.
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index d9d28a965bac..8355faf8ffde 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
@@ -545,7 +545,7 @@ xfs_flush_device( | |||
545 | xfs_log_force(ip->i_mount, (xfs_lsn_t)0, XFS_LOG_FORCE|XFS_LOG_SYNC); | 545 | xfs_log_force(ip->i_mount, (xfs_lsn_t)0, XFS_LOG_FORCE|XFS_LOG_SYNC); |
546 | } | 546 | } |
547 | 547 | ||
548 | #define SYNCD_FLAGS (SYNC_FSDATA|SYNC_BDFLUSH|SYNC_ATTR) | 548 | #define SYNCD_FLAGS (SYNC_FSDATA|SYNC_BDFLUSH|SYNC_ATTR|SYNC_REFCACHE) |
549 | STATIC void | 549 | STATIC void |
550 | vfs_sync_worker( | 550 | vfs_sync_worker( |
551 | vfs_t *vfsp, | 551 | vfs_t *vfsp, |
@@ -972,7 +972,6 @@ init_xfs_fs( void ) | |||
972 | error = register_filesystem(&xfs_fs_type); | 972 | error = register_filesystem(&xfs_fs_type); |
973 | if (error) | 973 | if (error) |
974 | goto undo_register; | 974 | goto undo_register; |
975 | XFS_DM_INIT(&xfs_fs_type); | ||
976 | return 0; | 975 | return 0; |
977 | 976 | ||
978 | undo_register: | 977 | undo_register: |
@@ -989,7 +988,6 @@ STATIC void __exit | |||
989 | exit_xfs_fs( void ) | 988 | exit_xfs_fs( void ) |
990 | { | 989 | { |
991 | vfs_exitquota(); | 990 | vfs_exitquota(); |
992 | XFS_DM_EXIT(&xfs_fs_type); | ||
993 | unregister_filesystem(&xfs_fs_type); | 991 | unregister_filesystem(&xfs_fs_type); |
994 | xfs_cleanup(); | 992 | xfs_cleanup(); |
995 | xfs_buf_terminate(); | 993 | xfs_buf_terminate(); |