aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log_priv.h
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_log_priv.h')
-rw-r--r--fs/xfs/xfs_log_priv.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 5fa21b030666..07da6a72628a 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -105,9 +105,6 @@ struct xfs_mount;
105 ((i) >> 24) 105 ((i) >> 24)
106#endif 106#endif
107 107
108#define GRANT_LOCK(log) mutex_spinlock(&(log)->l_grant_lock)
109#define GRANT_UNLOCK(log, s) mutex_spinunlock(&(log)->l_grant_lock, s)
110
111#define xlog_panic(args...) cmn_err(CE_PANIC, ## args) 108#define xlog_panic(args...) cmn_err(CE_PANIC, ## args)
112#define xlog_exit(args...) cmn_err(CE_PANIC, ## args) 109#define xlog_exit(args...) cmn_err(CE_PANIC, ## args)
113#define xlog_warn(args...) cmn_err(CE_WARN, ## args) 110#define xlog_warn(args...) cmn_err(CE_WARN, ## args)
@@ -437,7 +434,7 @@ typedef struct log {
437 char *l_iclog_bak[XLOG_MAX_ICLOGS]; 434 char *l_iclog_bak[XLOG_MAX_ICLOGS];
438 435
439 /* The following block of fields are changed while holding grant_lock */ 436 /* The following block of fields are changed while holding grant_lock */
440 lock_t l_grant_lock; 437 spinlock_t l_grant_lock;
441 xlog_ticket_t *l_reserve_headq; 438 xlog_ticket_t *l_reserve_headq;
442 xlog_ticket_t *l_write_headq; 439 xlog_ticket_t *l_write_headq;
443 int l_grant_reserve_cycle; 440 int l_grant_reserve_cycle;