leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[XFS] Resolve the xlog_grant_log_space hang, revert inline to macro.

Browse Source 
SGI-PV: 946205
SGI-Modid: xfs-linux-melb:xfs-kern:24567a

Signed-off-by: Nathan Scott <nathans@sgi.com>
This commit is contained in:
Nathan Scott 2005-11-25 16:42:28 +11:00
parent e0144ca553
commit 551c81e2d3
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/xfs/xfs_log_priv.h
View File

@ -494,10 +494,8 @@ typedef struct log {
#define XLOG_FORCED_SHUTDOWN(log) ((log)->l_flags & XLOG_IO_ERROR) #define XLOG_FORCED_SHUTDOWN(log) ((log)->l_flags & XLOG_IO_ERROR)
#define XLOG_GRANT_SUB_SPACE(log,bytes,type) \ #define XLOG_GRANT_SUB_SPACE(log,bytes,type) \
xlog_grant_sub_space(log,bytes,type) { \
static inline void xlog_grant_sub_space(struct log *log, int bytes, int type)
{
if (type == 'w') { \ if (type == 'w') { \
(log)->l_grant_write_bytes -= (bytes); \ (log)->l_grant_write_bytes -= (bytes); \
if ((log)->l_grant_write_bytes < 0) { \ if ((log)->l_grant_write_bytes < 0) { \
@ -511,13 +509,9 @@ static inline void xlog_grant_sub_space(struct log *log, int bytes, int type)
(log)->l_grant_reserve_cycle--; \ (log)->l_grant_reserve_cycle--; \
} \ } \
} \ } \
} }
#define XLOG_GRANT_ADD_SPACE(log,bytes,type) \
#define XLOG_GRANT_ADD_SPACE(log,bytes,type) \ { \
xlog_grant_add_space(log,bytes,type)
static inline void
xlog_grant_add_space(struct log *log, int bytes, int type)
{
if (type == 'w') { \ if (type == 'w') { \
(log)->l_grant_write_bytes += (bytes); \ (log)->l_grant_write_bytes += (bytes); \
if ((log)->l_grant_write_bytes > (log)->l_logsize) { \ if ((log)->l_grant_write_bytes > (log)->l_logsize) { \
@ -531,12 +525,9 @@ xlog_grant_add_space(struct log *log, int bytes, int type)
(log)->l_grant_reserve_cycle++; \ (log)->l_grant_reserve_cycle++; \
} \ } \
} \ } \
} }
#define XLOG_INS_TICKETQ(q, tic) \
#define XLOG_INS_TICKETQ(q, tic) xlog_ins_ticketq(q, tic) { \
static inline void
xlog_ins_ticketq(struct xlog_ticket *q, struct xlog_ticket *tic)
{ \
if (q) { \ if (q) { \
(tic)->t_next = (q); \ (tic)->t_next = (q); \
(tic)->t_prev = (q)->t_prev; \ (tic)->t_prev = (q)->t_prev; \
@ -547,12 +538,9 @@ xlog_ins_ticketq(struct xlog_ticket *q, struct xlog_ticket *tic)
(q) = (tic); \ (q) = (tic); \
} \ } \
(tic)->t_flags |= XLOG_TIC_IN_Q; \ (tic)->t_flags |= XLOG_TIC_IN_Q; \
} }
#define XLOG_DEL_TICKETQ(q, tic) \
#define XLOG_DEL_TICKETQ(q, tic) xlog_del_ticketq(q, tic) { \
static inline void
xlog_del_ticketq(struct xlog_ticket *q, struct xlog_ticket *tic)
{ \
if ((tic) == (tic)->t_next) { \ if ((tic) == (tic)->t_next) { \
(q) = NULL; \ (q) = NULL; \
} else { \ } else { \
@ -562,7 +550,7 @@ xlog_del_ticketq(struct xlog_ticket *q, struct xlog_ticket *tic)
} \ } \
(tic)->t_next = (tic)->t_prev = NULL; \ (tic)->t_next = (tic)->t_prev = NULL; \
(tic)->t_flags &= ~XLOG_TIC_IN_Q; \ (tic)->t_flags &= ~XLOG_TIC_IN_Q; \
} }
/* common routines */ /* common routines */
extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp); extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp);