Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 551c81e2 authored by Nathan Scott's avatar Nathan Scott
Browse files

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



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

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent e0144ca5

fs/xfs/xfs_log_priv.h

+12 −24
Original line number Diff line number Diff line
@@ -495,9 +495,7 @@ typedef struct log { 
#define XLOG_FORCED_SHUTDOWN(log)	((log)->l_flags & XLOG_IO_ERROR)



#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') {						\

		(log)->l_grant_write_bytes -= (bytes);			\

		if ((log)->l_grant_write_bytes < 0) {			\
@@ -512,12 +510,8 @@ static inline void xlog_grant_sub_space(struct log *log, int bytes, int 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') {						\

		(log)->l_grant_write_bytes += (bytes);			\

		if ((log)->l_grant_write_bytes > (log)->l_logsize) {	\
@@ -532,10 +526,7 @@ xlog_grant_add_space(struct log *log, int bytes, int type) 
		}							\

	 }								\

    }



#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)

#define XLOG_INS_TICKETQ(q, tic)			\

    {							\

	if (q) {					\

		(tic)->t_next	    = (q);		\
@@ -548,10 +539,7 @@ xlog_ins_ticketq(struct xlog_ticket *q, struct xlog_ticket *tic) 
	}						\

	(tic)->t_flags |= XLOG_TIC_IN_Q;		\

    }



#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)

#define XLOG_DEL_TICKETQ(q, tic)			\

    {							\

	if ((tic) == (tic)->t_next) {			\

		(q) = NULL;				\