diff options
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r-- | fs/xfs/xfs_mount.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index ee5df5fae829..c67f8a9ae418 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -1278,7 +1278,7 @@ xfs_mountfs( | |||
1278 | * log and makes sure that incore structures are freed. | 1278 | * log and makes sure that incore structures are freed. |
1279 | */ | 1279 | */ |
1280 | int | 1280 | int |
1281 | xfs_unmountfs(xfs_mount_t *mp, struct cred *cr) | 1281 | xfs_unmountfs(xfs_mount_t *mp) |
1282 | { | 1282 | { |
1283 | __uint64_t resblks; | 1283 | __uint64_t resblks; |
1284 | int error = 0; | 1284 | int error = 0; |
@@ -1345,7 +1345,6 @@ xfs_unmountfs(xfs_mount_t *mp, struct cred *cr) | |||
1345 | */ | 1345 | */ |
1346 | ASSERT(mp->m_inodes == NULL); | 1346 | ASSERT(mp->m_inodes == NULL); |
1347 | 1347 | ||
1348 | xfs_unmountfs_close(mp, cr); | ||
1349 | if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0) | 1348 | if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0) |
1350 | uuid_table_remove(&mp->m_sb.sb_uuid); | 1349 | uuid_table_remove(&mp->m_sb.sb_uuid); |
1351 | 1350 | ||
@@ -1356,16 +1355,6 @@ xfs_unmountfs(xfs_mount_t *mp, struct cred *cr) | |||
1356 | return 0; | 1355 | return 0; |
1357 | } | 1356 | } |
1358 | 1357 | ||
1359 | void | ||
1360 | xfs_unmountfs_close(xfs_mount_t *mp, struct cred *cr) | ||
1361 | { | ||
1362 | if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) | ||
1363 | xfs_free_buftarg(mp->m_logdev_targp, 1); | ||
1364 | if (mp->m_rtdev_targp) | ||
1365 | xfs_free_buftarg(mp->m_rtdev_targp, 1); | ||
1366 | xfs_free_buftarg(mp->m_ddev_targp, 0); | ||
1367 | } | ||
1368 | |||
1369 | STATIC void | 1358 | STATIC void |
1370 | xfs_unmountfs_wait(xfs_mount_t *mp) | 1359 | xfs_unmountfs_wait(xfs_mount_t *mp) |
1371 | { | 1360 | { |