diff options
author | Lachlan McIlroy <lachlan@sgi.com> | 2007-02-10 02:35:33 -0500 |
---|---|---|
committer | Tim Shimmin <tes@sgi.com> | 2007-02-10 02:35:33 -0500 |
commit | 1f9b3b64d417a714eb79d9a4cd4927ab304b0fc0 (patch) | |
tree | 193664b3b8d154d885ba0a49f8726a3d3007ccc7 | |
parent | 1c91ad3aedba82a64ae06a5a0a5651105d378112 (diff) |
[XFS] remove unused xflags parameter from sync routines
SGI-PV: 959137
SGI-Modid: xfs-linux-melb:xfs-kern:27710a
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Tim Shimmin <tes@sgi.com>
-rw-r--r-- | fs/xfs/quota/xfs_qm_syscalls.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.h | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_vfsops.c | 18 |
3 files changed, 8 insertions, 16 deletions
diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c index ed620c4d1594..0c032fde9e33 100644 --- a/fs/xfs/quota/xfs_qm_syscalls.c +++ b/fs/xfs/quota/xfs_qm_syscalls.c | |||
@@ -134,7 +134,7 @@ xfs_qm_quotactl( | |||
134 | break; | 134 | break; |
135 | 135 | ||
136 | case Q_XQUOTASYNC: | 136 | case Q_XQUOTASYNC: |
137 | return (xfs_sync_inodes(mp, SYNC_DELWRI, 0, NULL)); | 137 | return (xfs_sync_inodes(mp, SYNC_DELWRI, NULL)); |
138 | 138 | ||
139 | default: | 139 | default: |
140 | break; | 140 | break; |
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 416c89fbe8b5..9c33af88514e 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
@@ -616,8 +616,8 @@ extern struct xfs_buf *xfs_getsb(xfs_mount_t *, int); | |||
616 | extern int xfs_readsb(xfs_mount_t *, int); | 616 | extern int xfs_readsb(xfs_mount_t *, int); |
617 | extern void xfs_freesb(xfs_mount_t *); | 617 | extern void xfs_freesb(xfs_mount_t *); |
618 | extern void xfs_do_force_shutdown(bhv_desc_t *, int, char *, int); | 618 | extern void xfs_do_force_shutdown(bhv_desc_t *, int, char *, int); |
619 | extern int xfs_syncsub(xfs_mount_t *, int, int, int *); | 619 | extern int xfs_syncsub(xfs_mount_t *, int, int *); |
620 | extern int xfs_sync_inodes(xfs_mount_t *, int, int, int *); | 620 | extern int xfs_sync_inodes(xfs_mount_t *, int, int *); |
621 | extern xfs_agnumber_t xfs_initialize_perag(struct bhv_vfs *, xfs_mount_t *, | 621 | extern xfs_agnumber_t xfs_initialize_perag(struct bhv_vfs *, xfs_mount_t *, |
622 | xfs_agnumber_t); | 622 | xfs_agnumber_t); |
623 | extern void xfs_xlatesb(void *, struct xfs_sb *, int, __int64_t); | 623 | extern void xfs_xlatesb(void *, struct xfs_sb *, int, __int64_t); |
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c index 62336a4cc5a4..aec4e8d9cba7 100644 --- a/fs/xfs/xfs_vfsops.c +++ b/fs/xfs/xfs_vfsops.c | |||
@@ -640,7 +640,7 @@ xfs_quiesce_fs( | |||
640 | * we can write the unmount record. | 640 | * we can write the unmount record. |
641 | */ | 641 | */ |
642 | do { | 642 | do { |
643 | xfs_syncsub(mp, SYNC_REMOUNT|SYNC_ATTR|SYNC_WAIT, 0, NULL); | 643 | xfs_syncsub(mp, SYNC_REMOUNT|SYNC_ATTR|SYNC_WAIT, NULL); |
644 | pincount = xfs_flush_buftarg(mp->m_ddev_targp, 1); | 644 | pincount = xfs_flush_buftarg(mp->m_ddev_targp, 1); |
645 | if (!pincount) { | 645 | if (!pincount) { |
646 | delay(50); | 646 | delay(50); |
@@ -886,24 +886,20 @@ xfs_sync( | |||
886 | if (unlikely(flags == SYNC_QUIESCE)) | 886 | if (unlikely(flags == SYNC_QUIESCE)) |
887 | return xfs_quiesce_fs(mp); | 887 | return xfs_quiesce_fs(mp); |
888 | else | 888 | else |
889 | return xfs_syncsub(mp, flags, 0, NULL); | 889 | return xfs_syncsub(mp, flags, NULL); |
890 | } | 890 | } |
891 | 891 | ||
892 | /* | 892 | /* |
893 | * xfs sync routine for internal use | 893 | * xfs sync routine for internal use |
894 | * | 894 | * |
895 | * This routine supports all of the flags defined for the generic vfs_sync | 895 | * This routine supports all of the flags defined for the generic vfs_sync |
896 | * interface as explained above under xfs_sync. In the interests of not | 896 | * interface as explained above under xfs_sync. |
897 | * changing interfaces within the 6.5 family, additional internally- | ||
898 | * required functions are specified within a separate xflags parameter, | ||
899 | * only available by calling this routine. | ||
900 | * | 897 | * |
901 | */ | 898 | */ |
902 | int | 899 | int |
903 | xfs_sync_inodes( | 900 | xfs_sync_inodes( |
904 | xfs_mount_t *mp, | 901 | xfs_mount_t *mp, |
905 | int flags, | 902 | int flags, |
906 | int xflags, | ||
907 | int *bypassed) | 903 | int *bypassed) |
908 | { | 904 | { |
909 | xfs_inode_t *ip = NULL; | 905 | xfs_inode_t *ip = NULL; |
@@ -1412,17 +1408,13 @@ xfs_sync_inodes( | |||
1412 | * xfs sync routine for internal use | 1408 | * xfs sync routine for internal use |
1413 | * | 1409 | * |
1414 | * This routine supports all of the flags defined for the generic vfs_sync | 1410 | * This routine supports all of the flags defined for the generic vfs_sync |
1415 | * interface as explained above under xfs_sync. In the interests of not | 1411 | * interface as explained above under xfs_sync. |
1416 | * changing interfaces within the 6.5 family, additional internally- | ||
1417 | * required functions are specified within a separate xflags parameter, | ||
1418 | * only available by calling this routine. | ||
1419 | * | 1412 | * |
1420 | */ | 1413 | */ |
1421 | int | 1414 | int |
1422 | xfs_syncsub( | 1415 | xfs_syncsub( |
1423 | xfs_mount_t *mp, | 1416 | xfs_mount_t *mp, |
1424 | int flags, | 1417 | int flags, |
1425 | int xflags, | ||
1426 | int *bypassed) | 1418 | int *bypassed) |
1427 | { | 1419 | { |
1428 | int error = 0; | 1420 | int error = 0; |
@@ -1444,7 +1436,7 @@ xfs_syncsub( | |||
1444 | if (flags & SYNC_BDFLUSH) | 1436 | if (flags & SYNC_BDFLUSH) |
1445 | xfs_finish_reclaim_all(mp, 1); | 1437 | xfs_finish_reclaim_all(mp, 1); |
1446 | else | 1438 | else |
1447 | error = xfs_sync_inodes(mp, flags, xflags, bypassed); | 1439 | error = xfs_sync_inodes(mp, flags, bypassed); |
1448 | } | 1440 | } |
1449 | 1441 | ||
1450 | /* | 1442 | /* |