2 files changed, 12 insertions, 2 deletions

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index ac999789a44d..c48bf61f17bd 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -617,7 +617,8 @@ xfs_log_unmount_write(xfs_mount_t *mp)
                 reg[0].i_len  = sizeof(magic);
                 XLOG_VEC_SET_TYPE(&reg[0], XLOG_REG_TYPE_UNMOUNT);
 
-                error = xfs_log_reserve(mp, 600, 1, &tic, XFS_LOG, 0, 0);
+                error = xfs_log_reserve(mp, 600, 1, &tic,
+                                        XFS_LOG, 0, XLOG_UNMOUNT_REC_TYPE);
                 if (!error) {
                         /* remove inited flag */
                         ((xlog_ticket_t *)tic)->t_flags = 0;
@@ -655,8 +656,11 @@ xfs_log_unmount_write(xfs_mount_t *mp)
                 } else {
                         LOG_UNLOCK(log, s);
                 }
-                if (tic)
+                if (tic) {
+                        xlog_trace_loggrant(log, tic, "unmount rec");
+                        xlog_ungrant_log_space(log, tic);
                         xlog_state_put_ticket(log, tic);
+                }
         } else {
                 /*
                  * We're already in forced_shutdown mode, couldn't
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 7bf5046d8d28..9bd3cdf11a87 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -502,6 +502,12 @@ extern int	 xlog_bread(xlog_t *, xfs_daddr_t, int, struct xfs_buf *);
 #define XLOG_TRACE_SLEEP_FLUSH 3
 #define XLOG_TRACE_WAKE_FLUSH  4
 
+/*
+ * Unmount record type is used as a pseudo transaction type for the ticket.
+ * It's value must be outside the range of XFS_TRANS_* values.
+ */
+#define XLOG_UNMOUNT_REC_TYPE   (-1U)
+
 #endif  /* __KERNEL__ */
 
 #endif  /* __XFS_LOG_PRIV_H__ */