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

Commit 61e63ecb authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: consolidate superblock logging functions 



We now have several superblock loggin functions that are identical
except for the transaction reservation and whether it shoul dbe a
synchronous transaction or not. Consolidate these all into a single
function, a single reserveration and a sync flag and call it
xfs_sync_sb().

Also, xfs_mod_sb() is not really a modification function - it's the
operation of logging the superblock buffer. hence change the name of
it to reflect this.

Note that we have to change the mp->m_update_flags that are passed
around at mount time to a boolean simply to indicate a superblock
update is needed.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 4d11a402

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ xfs_sbversion_add_attr2(xfs_mount_t *mp, xfs_trans_t *tp) 
		if (!xfs_sb_version_hasattr2(&mp->m_sb)) {

			xfs_sb_version_addattr2(&mp->m_sb);

			spin_unlock(&mp->m_sb_lock);

			xfs_mod_sb(tp);

			xfs_log_sb(tp);

		} else

			spin_unlock(&mp->m_sb_lock);

	}

fs/xfs/libxfs/xfs_bmap.c

+5 −5
Original line number Diff line number Diff line
@@ -1221,20 +1221,20 @@ xfs_bmap_add_attrfork( 
		goto bmap_cancel;

	if (!xfs_sb_version_hasattr(&mp->m_sb) ||

	   (!xfs_sb_version_hasattr2(&mp->m_sb) && version == 2)) {

		bool mod_sb = false;

		bool log_sb = false;



		spin_lock(&mp->m_sb_lock);

		if (!xfs_sb_version_hasattr(&mp->m_sb)) {

			xfs_sb_version_addattr(&mp->m_sb);

			mod_sb = true;

			log_sb = true;

		}

		if (!xfs_sb_version_hasattr2(&mp->m_sb) && version == 2) {

			xfs_sb_version_addattr2(&mp->m_sb);

			mod_sb = true;

			log_sb = true;

		}

		spin_unlock(&mp->m_sb_lock);

		if (mod_sb)

			xfs_mod_sb(tp);

		if (log_sb)

			xfs_log_sb(tp);

	}



	error = xfs_bmap_finish(&tp, &flist, &committed);

fs/xfs/libxfs/xfs_sb.c

+37 −6
Original line number Diff line number Diff line
@@ -753,14 +753,13 @@ xfs_initialize_perag_data( 
}



/*

 * xfs_mod_sb() can be used to copy arbitrary changes to the

 * in-core superblock into the superblock buffer to be logged.

 * It does not provide the higher level of locking that is

 * needed to protect the in-core superblock from concurrent

 * access.

 * xfs_log_sb() can be used to copy arbitrary changes to the in-core superblock

 * into the superblock buffer to be logged.  It does not provide the higher

 * level of locking that is needed to protect the in-core superblock from

 * concurrent access.

 */

void

xfs_mod_sb(

xfs_log_sb(

	struct xfs_trans	*tp)

{

	struct xfs_mount	*mp = tp->t_mountp;
@@ -770,3 +769,35 @@ xfs_mod_sb( 
	xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SB_BUF);

	xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb));

}



/*

 * xfs_sync_sb

 *

 * Sync the superblock to disk.

 *

 * Note that the caller is responsible for checking the frozen state of the

 * filesystem. This procedure uses the non-blocking transaction allocator and

 * thus will allow modifications to a frozen fs. This is required because this

 * code can be called during the process of freezing where use of the high-level

 * allocator would deadlock.

 */

int

xfs_sync_sb(

	struct xfs_mount	*mp,

	bool			wait)

{

	struct xfs_trans	*tp;

	int			error;



	tp = _xfs_trans_alloc(mp, XFS_TRANS_SB_CHANGE, KM_SLEEP);

	error = xfs_trans_reserve(tp, &M_RES(mp)->tr_sb, 0, 0);

	if (error) {

		xfs_trans_cancel(tp, 0);

		return error;

	}



	xfs_log_sb(tp);

	if (wait)

		xfs_trans_set_sync(tp);

	return xfs_trans_commit(tp, 0);

}

fs/xfs/libxfs/xfs_sb.h

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ extern void xfs_perag_put(struct xfs_perag *pag); 
extern int	xfs_initialize_perag_data(struct xfs_mount *, xfs_agnumber_t);



extern void	xfs_sb_calc_crc(struct xfs_buf *bp);

extern void	xfs_mod_sb(struct xfs_trans *tp);

extern void	xfs_log_sb(struct xfs_trans *tp);

extern int	xfs_sync_sb(struct xfs_mount *mp, bool wait);

extern void	xfs_sb_mount_common(struct xfs_mount *mp, struct xfs_sb *sbp);

extern void	xfs_sb_from_disk(struct xfs_sb *to, struct xfs_dsb *from);

extern void	xfs_sb_to_disk(struct xfs_dsb *to, struct xfs_sb *from);

fs/xfs/libxfs/xfs_shared.h

+15 −18
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ extern const struct xfs_buf_ops xfs_symlink_buf_ops; 
#define	XFS_TRANS_ATTR_RM		23

#define	XFS_TRANS_ATTR_FLAG		24

#define	XFS_TRANS_CLEAR_AGI_BUCKET	25

#define XFS_TRANS_QM_SBCHANGE		26

#define XFS_TRANS_SB_CHANGE		26

/*

 * Dummy entries since we use the transaction type to index into the

 * trans_type[] in xlog_recover_print_trans_head()
@@ -95,17 +95,15 @@ extern const struct xfs_buf_ops xfs_symlink_buf_ops; 
#define XFS_TRANS_QM_DQCLUSTER		32

#define XFS_TRANS_QM_QINOCREATE		33

#define XFS_TRANS_QM_QUOTAOFF_END	34

#define XFS_TRANS_SB_UNIT		35

#define XFS_TRANS_FSYNC_TS		36

#define	XFS_TRANS_GROWFSRT_ALLOC	37

#define	XFS_TRANS_GROWFSRT_ZERO		38

#define	XFS_TRANS_GROWFSRT_FREE		39

#define	XFS_TRANS_SWAPEXT		40

#define	XFS_TRANS_SB_COUNT		41

#define	XFS_TRANS_CHECKPOINT		42

#define	XFS_TRANS_ICREATE		43

#define	XFS_TRANS_CREATE_TMPFILE	44

#define	XFS_TRANS_TYPE_MAX		44

#define XFS_TRANS_FSYNC_TS		35

#define	XFS_TRANS_GROWFSRT_ALLOC	36

#define	XFS_TRANS_GROWFSRT_ZERO		37

#define	XFS_TRANS_GROWFSRT_FREE		38

#define	XFS_TRANS_SWAPEXT		39

#define	XFS_TRANS_CHECKPOINT		40

#define	XFS_TRANS_ICREATE		41

#define	XFS_TRANS_CREATE_TMPFILE	42

#define	XFS_TRANS_TYPE_MAX		43

/* new transaction types need to be reflected in xfs_logprint(8) */



#define XFS_TRANS_TYPES \
@@ -113,7 +111,6 @@ extern const struct xfs_buf_ops xfs_symlink_buf_ops; 
	{ XFS_TRANS_SETATTR_SIZE,	"SETATTR_SIZE" }, \

	{ XFS_TRANS_INACTIVE,		"INACTIVE" }, \

	{ XFS_TRANS_CREATE,		"CREATE" }, \

	{ XFS_TRANS_CREATE_TMPFILE,	"CREATE_TMPFILE" }, \

	{ XFS_TRANS_CREATE_TRUNC,	"CREATE_TRUNC" }, \

	{ XFS_TRANS_TRUNCATE_FILE,	"TRUNCATE_FILE" }, \

	{ XFS_TRANS_REMOVE,		"REMOVE" }, \
@@ -134,23 +131,23 @@ extern const struct xfs_buf_ops xfs_symlink_buf_ops; 
	{ XFS_TRANS_ATTR_RM,		"ATTR_RM" }, \

	{ XFS_TRANS_ATTR_FLAG,		"ATTR_FLAG" }, \

	{ XFS_TRANS_CLEAR_AGI_BUCKET,	"CLEAR_AGI_BUCKET" }, \

	{ XFS_TRANS_QM_SBCHANGE,	"QM_SBCHANGE" }, \

	{ XFS_TRANS_SB_CHANGE,		"SBCHANGE" }, \

	{ XFS_TRANS_DUMMY1,		"DUMMY1" }, \

	{ XFS_TRANS_DUMMY2,		"DUMMY2" }, \

	{ XFS_TRANS_QM_QUOTAOFF,	"QM_QUOTAOFF" }, \

	{ XFS_TRANS_QM_DQALLOC,		"QM_DQALLOC" }, \

	{ XFS_TRANS_QM_SETQLIM,		"QM_SETQLIM" }, \

	{ XFS_TRANS_QM_DQCLUSTER,	"QM_DQCLUSTER" }, \

	{ XFS_TRANS_QM_QINOCREATE,	"QM_QINOCREATE" }, \

	{ XFS_TRANS_QM_QUOTAOFF_END,	"QM_QOFF_END" }, \

	{ XFS_TRANS_SB_UNIT,		"SB_UNIT" }, \

	{ XFS_TRANS_FSYNC_TS,		"FSYNC_TS" }, \

	{ XFS_TRANS_GROWFSRT_ALLOC,	"GROWFSRT_ALLOC" }, \

	{ XFS_TRANS_GROWFSRT_ZERO,	"GROWFSRT_ZERO" }, \

	{ XFS_TRANS_GROWFSRT_FREE,	"GROWFSRT_FREE" }, \

	{ XFS_TRANS_SWAPEXT,		"SWAPEXT" }, \

	{ XFS_TRANS_SB_COUNT,		"SB_COUNT" }, \

	{ XFS_TRANS_CHECKPOINT,		"CHECKPOINT" }, \

	{ XFS_TRANS_DUMMY1,		"DUMMY1" }, \

	{ XFS_TRANS_DUMMY2,		"DUMMY2" }, \

	{ XFS_TRANS_ICREATE,		"ICREATE" }, \

	{ XFS_TRANS_CREATE_TMPFILE,	"CREATE_TMPFILE" }, \

	{ XLOG_UNMOUNT_REC_TYPE,	"UNMOUNT" }



/*