diff options
author | Christoph Hellwig <hch@infradead.org> | 2008-05-19 21:30:52 -0400 |
---|---|---|
committer | Niv Sardi <xaiki@debian.org> | 2008-07-28 02:58:20 -0400 |
commit | e48ad3160e5c5f5b952c7a7ed814f6f289a60100 (patch) | |
tree | 25f1c0d30cc6b88976ff5dd31f1f983248c238cf /fs/xfs/xfs_vfsops.h | |
parent | 61436febae29085bffc7c291db03cbd709dc68a3 (diff) |
[XFS] merge xfs_unmount into xfs_fs_put_super / xfs_fs_fill_super
xfs_unmount is small and already pretty Linux specific, so merge it into
the callers. The real unmount path is simplified a little by doing a
WARN_ON on the xfs_unmount_flush retval directly instead of propagating
the error back to the caller, and the mout failure case in simplified
significantly by removing the forced shutdown case and all the dmapi
events that shouldn't be sent because the dmapi mount event hasn't been
sent by that time either.
SGI-PV: 981951
SGI-Modid: xfs-linux-melb:xfs-kern:31188a
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_vfsops.h')
-rw-r--r-- | fs/xfs/xfs_vfsops.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_vfsops.h b/fs/xfs/xfs_vfsops.h index 995091f19499..de64bb6542df 100644 --- a/fs/xfs/xfs_vfsops.h +++ b/fs/xfs/xfs_vfsops.h | |||
@@ -10,7 +10,6 @@ struct xfs_mount_args; | |||
10 | 10 | ||
11 | int xfs_mount(struct xfs_mount *mp, struct xfs_mount_args *args, | 11 | int xfs_mount(struct xfs_mount *mp, struct xfs_mount_args *args, |
12 | struct cred *credp); | 12 | struct cred *credp); |
13 | int xfs_unmount(struct xfs_mount *mp, int flags, struct cred *credp); | ||
14 | int xfs_sync(struct xfs_mount *mp, int flags); | 13 | int xfs_sync(struct xfs_mount *mp, int flags); |
15 | void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname, | 14 | void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname, |
16 | int lnnum); | 15 | int lnnum); |