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: Dave Chinner <dchinner@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
		
			
				
	
	
		
			116 lines
		
	
	
	
		
			4.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			116 lines
		
	
	
	
		
			4.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
 | 
						|
 * All Rights Reserved.
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU General Public License as
 | 
						|
 * published by the Free Software Foundation.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it would be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program; if not, write the Free Software Foundation,
 | 
						|
 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 | 
						|
 */
 | 
						|
#ifndef	__XFS_TRANS_RESV_H__
 | 
						|
#define	__XFS_TRANS_RESV_H__
 | 
						|
 | 
						|
struct xfs_mount;
 | 
						|
 | 
						|
/*
 | 
						|
 * structure for maintaining pre-calculated transaction reservations.
 | 
						|
 */
 | 
						|
struct xfs_trans_res {
 | 
						|
	uint	tr_logres;	/* log space unit in bytes per log ticket */
 | 
						|
	int	tr_logcount;	/* number of log operations per log ticket */
 | 
						|
	int	tr_logflags;	/* log flags, currently only used for indicating
 | 
						|
				 * a reservation request is permanent or not */
 | 
						|
};
 | 
						|
 | 
						|
struct xfs_trans_resv {
 | 
						|
	struct xfs_trans_res	tr_write;	/* extent alloc trans */
 | 
						|
	struct xfs_trans_res	tr_itruncate;	/* truncate trans */
 | 
						|
	struct xfs_trans_res	tr_rename;	/* rename trans */
 | 
						|
	struct xfs_trans_res	tr_link;	/* link trans */
 | 
						|
	struct xfs_trans_res	tr_remove;	/* unlink trans */
 | 
						|
	struct xfs_trans_res	tr_symlink;	/* symlink trans */
 | 
						|
	struct xfs_trans_res	tr_create;	/* create trans */
 | 
						|
	struct xfs_trans_res	tr_create_tmpfile; /* create O_TMPFILE trans */
 | 
						|
	struct xfs_trans_res	tr_mkdir;	/* mkdir trans */
 | 
						|
	struct xfs_trans_res	tr_ifree;	/* inode free trans */
 | 
						|
	struct xfs_trans_res	tr_ichange;	/* inode update trans */
 | 
						|
	struct xfs_trans_res	tr_growdata;	/* fs data section grow trans */
 | 
						|
	struct xfs_trans_res	tr_addafork;	/* add inode attr fork trans */
 | 
						|
	struct xfs_trans_res	tr_writeid;	/* write setuid/setgid file */
 | 
						|
	struct xfs_trans_res	tr_attrinval;	/* attr fork buffer
 | 
						|
						 * invalidation */
 | 
						|
	struct xfs_trans_res	tr_attrsetm;	/* set/create an attribute at
 | 
						|
						 * mount time */
 | 
						|
	struct xfs_trans_res	tr_attrsetrt;	/* set/create an attribute at
 | 
						|
						 * runtime */
 | 
						|
	struct xfs_trans_res	tr_attrrm;	/* remove an attribute */
 | 
						|
	struct xfs_trans_res	tr_clearagi;	/* clear agi unlinked bucket */
 | 
						|
	struct xfs_trans_res	tr_growrtalloc;	/* grow realtime allocations */
 | 
						|
	struct xfs_trans_res	tr_growrtzero;	/* grow realtime zeroing */
 | 
						|
	struct xfs_trans_res	tr_growrtfree;	/* grow realtime freeing */
 | 
						|
	struct xfs_trans_res	tr_qm_setqlim;	/* adjust quota limits */
 | 
						|
	struct xfs_trans_res	tr_qm_dqalloc;	/* allocate quota on disk */
 | 
						|
	struct xfs_trans_res	tr_qm_quotaoff;	/* turn quota off */
 | 
						|
	struct xfs_trans_res	tr_qm_equotaoff;/* end of turn quota off */
 | 
						|
	struct xfs_trans_res	tr_sb;		/* modify superblock */
 | 
						|
	struct xfs_trans_res	tr_fsyncts;	/* update timestamps on fsync */
 | 
						|
};
 | 
						|
 | 
						|
/* shorthand way of accessing reservation structure */
 | 
						|
#define M_RES(mp)	(&(mp)->m_resv)
 | 
						|
 | 
						|
/*
 | 
						|
 * Per-extent log reservation for the allocation btree changes
 | 
						|
 * involved in freeing or allocating an extent.
 | 
						|
 * 2 trees * (2 blocks/level * max depth - 1) * block size
 | 
						|
 */
 | 
						|
#define	XFS_ALLOCFREE_LOG_RES(mp,nx) \
 | 
						|
	((nx) * (2 * XFS_FSB_TO_B((mp), 2 * XFS_AG_MAXLEVELS(mp) - 1)))
 | 
						|
#define	XFS_ALLOCFREE_LOG_COUNT(mp,nx) \
 | 
						|
	((nx) * (2 * (2 * XFS_AG_MAXLEVELS(mp) - 1)))
 | 
						|
 | 
						|
/*
 | 
						|
 * Per-directory log reservation for any directory change.
 | 
						|
 * dir blocks: (1 btree block per level + data block + free block) * dblock size
 | 
						|
 * bmap btree: (levels + 2) * max depth * block size
 | 
						|
 * v2 directory blocks can be fragmented below the dirblksize down to the fsb
 | 
						|
 * size, so account for that in the DAENTER macros.
 | 
						|
 */
 | 
						|
#define	XFS_DIROP_LOG_RES(mp)	\
 | 
						|
	(XFS_FSB_TO_B(mp, XFS_DAENTER_BLOCKS(mp, XFS_DATA_FORK)) + \
 | 
						|
	 (XFS_FSB_TO_B(mp, XFS_DAENTER_BMAPS(mp, XFS_DATA_FORK) + 1)))
 | 
						|
#define	XFS_DIROP_LOG_COUNT(mp)	\
 | 
						|
	(XFS_DAENTER_BLOCKS(mp, XFS_DATA_FORK) + \
 | 
						|
	 XFS_DAENTER_BMAPS(mp, XFS_DATA_FORK) + 1)
 | 
						|
 | 
						|
/*
 | 
						|
 * Various log count values.
 | 
						|
 */
 | 
						|
#define	XFS_DEFAULT_LOG_COUNT		1
 | 
						|
#define	XFS_DEFAULT_PERM_LOG_COUNT	2
 | 
						|
#define	XFS_ITRUNCATE_LOG_COUNT		2
 | 
						|
#define XFS_INACTIVE_LOG_COUNT		2
 | 
						|
#define	XFS_CREATE_LOG_COUNT		2
 | 
						|
#define	XFS_CREATE_TMPFILE_LOG_COUNT	2
 | 
						|
#define	XFS_MKDIR_LOG_COUNT		3
 | 
						|
#define	XFS_SYMLINK_LOG_COUNT		3
 | 
						|
#define	XFS_REMOVE_LOG_COUNT		2
 | 
						|
#define	XFS_LINK_LOG_COUNT		2
 | 
						|
#define	XFS_RENAME_LOG_COUNT		2
 | 
						|
#define	XFS_WRITE_LOG_COUNT		2
 | 
						|
#define	XFS_ADDAFORK_LOG_COUNT		2
 | 
						|
#define	XFS_ATTRINVAL_LOG_COUNT		1
 | 
						|
#define	XFS_ATTRSET_LOG_COUNT		3
 | 
						|
#define	XFS_ATTRRM_LOG_COUNT		3
 | 
						|
 | 
						|
void xfs_trans_resv_calc(struct xfs_mount *mp, struct xfs_trans_resv *resp);
 | 
						|
 | 
						|
#endif	/* __XFS_TRANS_RESV_H__ */
 |