tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

xfs: decouple log and transaction headers

xfs_trans.h has a dependency on xfs_log.h for a couple of
structures. Most code that does transactions doesn't need to know
anything about the log, but this dependency means that they have to
include xfs_log.h. Decouple the xfs_trans.h and xfs_log.h header
files and clean up the includes to be in dependency order.

In doing this, remove the direct include of xfs_trans_reserve.h from
xfs_trans.h so that we remove the dependency between xfs_trans.h and
xfs_mount.h. Hence the xfs_trans.h include can be moved to the
indicate the actual dependencies other header files have on it.

Note that these are kernel only header files, so this does not
translate to any userspace changes at all.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

authored by

Dave Chinner and committed by
Ben Myers 239880ef d420e5c8

+276 -239
+4 -2
fs/xfs/xfs_alloc.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_format.h" 21 + #include "xfs_log_format.h" 21 22 #include "xfs_shared.h" 23 + #include "xfs_trans_resv.h" 22 24 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 25 #include "xfs_sb.h" 26 26 #include "xfs_ag.h" 27 27 #include "xfs_mount.h" ··· 36 36 #include "xfs_error.h" 37 37 #include "xfs_cksum.h" 38 38 #include "xfs_trace.h" 39 + #include "xfs_trans.h" 39 40 #include "xfs_buf_item.h" 41 + #include "xfs_log.h" 40 42 41 43 struct workqueue_struct *xfs_alloc_wq; 42 44
+3 -3
fs/xfs/xfs_alloc_btree.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_types.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 20 + #include "xfs_log_format.h" 21 + #include "xfs_trans_resv.h" 23 22 #include "xfs_sb.h" 24 23 #include "xfs_ag.h" 25 24 #include "xfs_mount.h" ··· 33 34 #include "xfs_error.h" 34 35 #include "xfs_trace.h" 35 36 #include "xfs_cksum.h" 37 + #include "xfs_trans.h" 36 38 37 39 38 40 STATIC struct xfs_btree_cur *
+4 -3
fs/xfs/xfs_aops.c
··· 16 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 17 17 */ 18 18 #include "xfs.h" 19 - #include "xfs_format.h" 20 19 #include "xfs_shared.h" 20 + #include "xfs_format.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 21 23 #include "xfs_sb.h" 22 24 #include "xfs_ag.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 25 #include "xfs_mount.h" 26 26 #include "xfs_bmap_btree.h" 27 27 #include "xfs_dinode.h" 28 28 #include "xfs_inode.h" 29 + #include "xfs_trans.h" 29 30 #include "xfs_inode_item.h" 30 31 #include "xfs_alloc.h" 31 32 #include "xfs_error.h"
+4 -4
fs/xfs/xfs_attr.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 22 24 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 - #include "xfs_trans_priv.h" 26 25 #include "xfs_sb.h" 27 26 #include "xfs_ag.h" 28 27 #include "xfs_mount.h" ··· 32 33 #include "xfs_dinode.h" 33 34 #include "xfs_inode.h" 34 35 #include "xfs_alloc.h" 36 + #include "xfs_trans.h" 35 37 #include "xfs_inode_item.h" 36 38 #include "xfs_bmap.h" 37 39 #include "xfs_bmap_util.h"
+4 -4
fs/xfs/xfs_attr_inactive.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_format.h" 22 21 #include "xfs_shared.h" 22 + #include "xfs_format.h" 23 + #include "xfs_log_format.h" 24 + #include "xfs_trans_resv.h" 23 25 #include "xfs_bit.h" 24 - #include "xfs_log.h" 25 - #include "xfs_trans.h" 26 26 #include "xfs_sb.h" 27 27 #include "xfs_ag.h" 28 28 #include "xfs_mount.h" ··· 36 36 #include "xfs_attr_remote.h" 37 37 #include "xfs_dinode.h" 38 38 #include "xfs_inode.h" 39 + #include "xfs_trans.h" 39 40 #include "xfs_inode_item.h" 40 41 #include "xfs_bmap.h" 41 42 #include "xfs_attr.h" ··· 44 43 #include "xfs_error.h" 45 44 #include "xfs_quota.h" 46 45 #include "xfs_trace.h" 47 - #include "xfs_trans_priv.h" 48 46 49 47 /* 50 48 * Look at all the extents for this logical region,
+3 -4
fs/xfs/xfs_attr_leaf.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_types.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 22 23 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 - #include "xfs_trans_priv.h" 26 24 #include "xfs_sb.h" 27 25 #include "xfs_ag.h" 28 26 #include "xfs_mount.h" ··· 35 37 #include "xfs_attr_remote.h" 36 38 #include "xfs_dinode.h" 37 39 #include "xfs_inode.h" 40 + #include "xfs_trans.h" 38 41 #include "xfs_inode_item.h" 39 42 #include "xfs_bmap.h" 40 43 #include "xfs_attr.h"
+3 -3
fs/xfs/xfs_attr_list.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_types.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 22 23 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 24 #include "xfs_sb.h" 26 25 #include "xfs_ag.h" 27 26 #include "xfs_mount.h" ··· 35 36 #include "xfs_attr_remote.h" 36 37 #include "xfs_dinode.h" 37 38 #include "xfs_inode.h" 39 + #include "xfs_trans.h" 38 40 #include "xfs_inode_item.h" 39 41 #include "xfs_bmap.h" 40 42 #include "xfs_attr.h"
+3 -4
fs/xfs/xfs_attr_remote.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_types.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 22 23 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 - #include "xfs_trans_priv.h" 26 24 #include "xfs_sb.h" 27 25 #include "xfs_ag.h" 28 26 #include "xfs_mount.h" ··· 31 33 #include "xfs_dinode.h" 32 34 #include "xfs_inode.h" 33 35 #include "xfs_alloc.h" 36 + #include "xfs_trans.h" 34 37 #include "xfs_inode_item.h" 35 38 #include "xfs_bmap.h" 36 39 #include "xfs_bmap_util.h"
+1 -4
fs/xfs/xfs_bit.c
··· 16 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 17 17 */ 18 18 #include "xfs.h" 19 - #include "xfs_bit.h" 20 - #include "xfs_log.h" 21 - #include "xfs_trans.h" 22 - #include "xfs_buf_item.h" 19 + #include "xfs_log_format.h" 23 20 24 21 /* 25 22 * XFS bit manipulation routines, used in non-realtime code.
+4 -3
fs/xfs/xfs_bmap.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 22 24 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 25 #include "xfs_inum.h" 25 - #include "xfs_trans.h" 26 26 #include "xfs_sb.h" 27 27 #include "xfs_ag.h" 28 28 #include "xfs_mount.h" ··· 37 37 #include "xfs_btree.h" 38 38 #include "xfs_mount.h" 39 39 #include "xfs_itable.h" 40 + #include "xfs_trans.h" 40 41 #include "xfs_inode_item.h" 41 42 #include "xfs_extfree_item.h" 42 43 #include "xfs_alloc.h"
+3 -2
fs/xfs/xfs_bmap_btree.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_format.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 21 23 #include "xfs_bit.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 24 24 #include "xfs_sb.h" 25 25 #include "xfs_ag.h" 26 26 #include "xfs_mount.h" ··· 29 29 #include "xfs_ialloc_btree.h" 30 30 #include "xfs_dinode.h" 31 31 #include "xfs_inode.h" 32 + #include "xfs_trans.h" 32 33 #include "xfs_inode_item.h" 33 34 #include "xfs_alloc.h" 34 35 #include "xfs_btree.h"
+5 -4
fs/xfs/xfs_bmap_util.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_format.h" 22 21 #include "xfs_shared.h" 22 + #include "xfs_format.h" 23 + #include "xfs_log_format.h" 24 + #include "xfs_trans_resv.h" 23 25 #include "xfs_bit.h" 24 - #include "xfs_log.h" 25 - #include "xfs_inum.h" 26 - #include "xfs_trans.h" 27 26 #include "xfs_sb.h" 28 27 #include "xfs_ag.h" 29 28 #include "xfs_mount.h" ··· 33 34 #include "xfs_dinode.h" 34 35 #include "xfs_inode.h" 35 36 #include "xfs_btree.h" 37 + #include "xfs_trans.h" 36 38 #include "xfs_extfree_item.h" 37 39 #include "xfs_alloc.h" 38 40 #include "xfs_bmap.h" ··· 44 44 #include "xfs_trans_space.h" 45 45 #include "xfs_trace.h" 46 46 #include "xfs_icache.h" 47 + #include "xfs_log.h" 47 48 48 49 /* Kernel only BMAP related definitions and functions */ 49 50
+3 -2
fs/xfs/xfs_btree.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_shared.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 21 23 #include "xfs_bit.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 24 24 #include "xfs_sb.h" 25 25 #include "xfs_ag.h" 26 26 #include "xfs_mount.h" ··· 29 29 #include "xfs_ialloc_btree.h" 30 30 #include "xfs_dinode.h" 31 31 #include "xfs_inode.h" 32 + #include "xfs_trans.h" 32 33 #include "xfs_inode_item.h" 33 34 #include "xfs_buf_item.h" 34 35 #include "xfs_btree.h"
+3 -2
fs/xfs/xfs_buf.c
··· 34 34 #include <linux/backing-dev.h> 35 35 #include <linux/freezer.h> 36 36 37 - #include "xfs_sb.h" 37 + #include "xfs_log_format.h" 38 38 #include "xfs_trans_resv.h" 39 - #include "xfs_log.h" 39 + #include "xfs_sb.h" 40 40 #include "xfs_ag.h" 41 41 #include "xfs_mount.h" 42 42 #include "xfs_trace.h" 43 + #include "xfs_log.h" 43 44 44 45 static kmem_zone_t *xfs_buf_zone; 45 46
+4 -3
fs/xfs/xfs_buf_item.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_types.h" 20 + #include "xfs_log_format.h" 21 + #include "xfs_trans_resv.h" 21 22 #include "xfs_bit.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 24 23 #include "xfs_sb.h" 25 24 #include "xfs_ag.h" 26 25 #include "xfs_mount.h" 26 + #include "xfs_trans.h" 27 27 #include "xfs_buf_item.h" 28 28 #include "xfs_trans_priv.h" 29 29 #include "xfs_error.h" 30 30 #include "xfs_trace.h" 31 + #include "xfs_log.h" 31 32 32 33 33 34 kmem_zone_t *xfs_buf_item_zone;
+4 -3
fs/xfs/xfs_da_btree.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_format.h" 22 21 #include "xfs_shared.h" 22 + #include "xfs_format.h" 23 + #include "xfs_log_format.h" 24 + #include "xfs_trans_resv.h" 23 25 #include "xfs_bit.h" 24 - #include "xfs_log.h" 25 - #include "xfs_trans.h" 26 26 #include "xfs_sb.h" 27 27 #include "xfs_ag.h" 28 28 #include "xfs_mount.h" ··· 33 33 #include "xfs_dir2_priv.h" 34 34 #include "xfs_dinode.h" 35 35 #include "xfs_inode.h" 36 + #include "xfs_trans.h" 36 37 #include "xfs_inode_item.h" 37 38 #include "xfs_alloc.h" 38 39 #include "xfs_bmap.h"
+3 -3
fs/xfs/xfs_dir2.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_types.h" 21 - #include "xfs_log.h" 20 + #include "xfs_log_format.h" 21 + #include "xfs_trans_resv.h" 22 22 #include "xfs_inum.h" 23 - #include "xfs_trans.h" 24 23 #include "xfs_sb.h" 25 24 #include "xfs_ag.h" 26 25 #include "xfs_mount.h" ··· 29 30 #include "xfs_alloc_btree.h" 30 31 #include "xfs_dinode.h" 31 32 #include "xfs_inode.h" 33 + #include "xfs_trans.h" 32 34 #include "xfs_inode_item.h" 33 35 #include "xfs_bmap.h" 34 36 #include "xfs_dir2.h"
+3 -3
fs/xfs/xfs_dir2_block.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_types.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 24 23 #include "xfs_sb.h" 25 24 #include "xfs_ag.h" 26 25 #include "xfs_mount.h" ··· 28 29 #include "xfs_bmap_btree.h" 29 30 #include "xfs_dinode.h" 30 31 #include "xfs_inode.h" 32 + #include "xfs_trans.h" 31 33 #include "xfs_inode_item.h" 32 34 #include "xfs_bmap.h" 33 35 #include "xfs_buf_item.h"
+3 -3
fs/xfs/xfs_dir2_data.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_types.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 24 23 #include "xfs_sb.h" 25 24 #include "xfs_ag.h" 26 25 #include "xfs_mount.h" ··· 31 32 #include "xfs_dir2.h" 32 33 #include "xfs_dir2_priv.h" 33 34 #include "xfs_error.h" 35 + #include "xfs_trans.h" 34 36 #include "xfs_buf_item.h" 35 37 #include "xfs_cksum.h" 36 38
+3 -3
fs/xfs/xfs_dir2_leaf.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_types.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 22 23 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 24 #include "xfs_sb.h" 26 25 #include "xfs_ag.h" 27 26 #include "xfs_mount.h" ··· 34 35 #include "xfs_dir2_priv.h" 35 36 #include "xfs_error.h" 36 37 #include "xfs_trace.h" 38 + #include "xfs_trans.h" 37 39 #include "xfs_buf_item.h" 38 40 #include "xfs_cksum.h" 39 41
+3 -3
fs/xfs/xfs_dir2_node.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_types.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 24 23 #include "xfs_sb.h" 25 24 #include "xfs_ag.h" 26 25 #include "xfs_mount.h" ··· 33 34 #include "xfs_dir2_priv.h" 34 35 #include "xfs_error.h" 35 36 #include "xfs_trace.h" 37 + #include "xfs_trans.h" 36 38 #include "xfs_buf_item.h" 37 39 #include "xfs_cksum.h" 38 40
+3 -3
fs/xfs/xfs_dir2_readdir.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_types.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 22 23 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 24 #include "xfs_sb.h" 26 25 #include "xfs_ag.h" 27 26 #include "xfs_mount.h" ··· 34 35 #include "xfs_error.h" 35 36 #include "xfs_trace.h" 36 37 #include "xfs_bmap.h" 38 + #include "xfs_trans.h" 37 39 38 40 /* 39 41 * Directory file type support functions
+3 -3
fs/xfs/xfs_dir2_sf.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_types.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 20 + #include "xfs_log_format.h" 21 + #include "xfs_trans_resv.h" 23 22 #include "xfs_sb.h" 24 23 #include "xfs_ag.h" 25 24 #include "xfs_mount.h" ··· 27 28 #include "xfs_bmap_btree.h" 28 29 #include "xfs_dinode.h" 29 30 #include "xfs_inode.h" 31 + #include "xfs_trans.h" 30 32 #include "xfs_inode_item.h" 31 33 #include "xfs_error.h" 32 34 #include "xfs_dir2.h"
+3 -2
fs/xfs/xfs_discard.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_format.h" 20 - #include "xfs_log.h" 21 - #include "xfs_trans.h" 20 + #include "xfs_log_format.h" 21 + #include "xfs_trans_resv.h" 22 22 #include "xfs_sb.h" 23 23 #include "xfs_ag.h" 24 24 #include "xfs_mount.h" ··· 33 33 #include "xfs_extent_busy.h" 34 34 #include "xfs_discard.h" 35 35 #include "xfs_trace.h" 36 + #include "xfs_log.h" 36 37 37 38 STATIC int 38 39 xfs_trim_extents(
+6 -4
fs/xfs/xfs_dquot.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_format.h" 21 + #include "xfs_log_format.h" 21 22 #include "xfs_shared.h" 23 + #include "xfs_trans_resv.h" 22 24 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 25 #include "xfs_sb.h" 26 26 #include "xfs_ag.h" 27 - #include "xfs_alloc.h" 28 - #include "xfs_quota.h" 29 27 #include "xfs_mount.h" 30 28 #include "xfs_bmap_btree.h" 31 29 #include "xfs_inode.h" 32 30 #include "xfs_bmap.h" 33 31 #include "xfs_bmap_util.h" 32 + #include "xfs_alloc.h" 33 + #include "xfs_quota.h" 34 34 #include "xfs_rtalloc.h" 35 35 #include "xfs_error.h" 36 36 #include "xfs_itable.h" 37 37 #include "xfs_attr.h" 38 + #include "xfs_trans.h" 38 39 #include "xfs_buf_item.h" 39 40 #include "xfs_trans_space.h" 40 41 #include "xfs_trans_priv.h" 41 42 #include "xfs_qm.h" 42 43 #include "xfs_cksum.h" 43 44 #include "xfs_trace.h" 45 + #include "xfs_log.h" 44 46 45 47 /* 46 48 * Lock order:
+3 -2
fs/xfs/xfs_dquot_buf.c
··· 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 21 #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 22 24 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 25 #include "xfs_sb.h" 26 26 #include "xfs_ag.h" 27 27 #include "xfs_mount.h" 28 28 #include "xfs_bmap_btree.h" 29 29 #include "xfs_inode.h" 30 30 #include "xfs_quota.h" 31 + #include "xfs_trans.h" 31 32 #include "xfs_qm.h" 32 33 #include "xfs_error.h" 33 34 #include "xfs_cksum.h"
+4 -2
fs/xfs/xfs_dquot_item.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_format.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 23 23 #include "xfs_sb.h" 24 24 #include "xfs_ag.h" 25 25 #include "xfs_alloc.h" ··· 32 32 #include "xfs_error.h" 33 33 #include "xfs_itable.h" 34 34 #include "xfs_attr.h" 35 + #include "xfs_trans.h" 35 36 #include "xfs_buf_item.h" 36 37 #include "xfs_trans_priv.h" 37 38 #include "xfs_qm.h" 39 + #include "xfs_log.h" 38 40 39 41 static inline struct xfs_dq_logitem *DQUOT_ITEM(struct xfs_log_item *lip) 40 42 {
+2 -3
fs/xfs/xfs_error.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_types.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 20 + #include "xfs_log_format.h" 21 + #include "xfs_trans_resv.h" 23 22 #include "xfs_sb.h" 24 23 #include "xfs_ag.h" 25 24 #include "xfs_mount.h"
+4 -3
fs/xfs/xfs_export.c
··· 16 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 17 17 */ 18 18 #include "xfs.h" 19 - #include "xfs_types.h" 20 - #include "xfs_log.h" 21 - #include "xfs_trans.h" 19 + #include "xfs_log_format.h" 20 + #include "xfs_trans_resv.h" 22 21 #include "xfs_sb.h" 23 22 #include "xfs_ag.h" 24 23 #include "xfs_mount.h" ··· 26 27 #include "xfs_export.h" 27 28 #include "xfs_bmap_btree.h" 28 29 #include "xfs_inode.h" 30 + #include "xfs_trans.h" 29 31 #include "xfs_inode_item.h" 30 32 #include "xfs_trace.h" 31 33 #include "xfs_icache.h" 34 + #include "xfs_log.h" 32 35 33 36 /* 34 37 * Note that we only accept fileids which are long enough rather than allow
+4 -2
fs/xfs/xfs_extent_busy.c
··· 20 20 #include "xfs.h" 21 21 #include "xfs_fs.h" 22 22 #include "xfs_format.h" 23 + #include "xfs_log_format.h" 23 24 #include "xfs_shared.h" 24 - #include "xfs_log.h" 25 - #include "xfs_trans.h" 25 + #include "xfs_trans_resv.h" 26 26 #include "xfs_sb.h" 27 27 #include "xfs_ag.h" 28 28 #include "xfs_mount.h" ··· 31 31 #include "xfs_inode.h" 32 32 #include "xfs_extent_busy.h" 33 33 #include "xfs_trace.h" 34 + #include "xfs_trans.h" 35 + #include "xfs_log.h" 34 36 35 37 void 36 38 xfs_extent_busy_insert(
+4 -4
fs/xfs/xfs_extfree_item.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_types.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 23 - #include "xfs_buf_item.h" 20 + #include "xfs_log_format.h" 21 + #include "xfs_trans_resv.h" 24 22 #include "xfs_sb.h" 25 23 #include "xfs_ag.h" 26 24 #include "xfs_mount.h" 25 + #include "xfs_trans.h" 27 26 #include "xfs_trans_priv.h" 27 + #include "xfs_buf_item.h" 28 28 #include "xfs_extfree_item.h" 29 29 30 30
+4 -2
fs/xfs/xfs_file.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_shared.h" 21 - #include "xfs_log.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 22 23 #include "xfs_sb.h" 23 24 #include "xfs_ag.h" 24 - #include "xfs_trans.h" 25 25 #include "xfs_mount.h" 26 26 #include "xfs_da_format.h" 27 27 #include "xfs_da_btree.h" ··· 29 29 #include "xfs_alloc.h" 30 30 #include "xfs_dinode.h" 31 31 #include "xfs_inode.h" 32 + #include "xfs_trans.h" 32 33 #include "xfs_inode_item.h" 33 34 #include "xfs_bmap.h" 34 35 #include "xfs_bmap_util.h" ··· 38 37 #include "xfs_dir2_priv.h" 39 38 #include "xfs_ioctl.h" 40 39 #include "xfs_trace.h" 40 + #include "xfs_log.h" 41 41 42 42 #include <linux/aio.h> 43 43 #include <linux/dcache.h>
+5 -5
fs/xfs/xfs_filestream.c
··· 16 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 17 17 */ 18 18 #include "xfs.h" 19 - #include "xfs_log.h" 19 + #include "xfs_log_format.h" 20 + #include "xfs_trans_resv.h" 21 + #include "xfs_ag.h" 22 + #include "xfs_sb.h" 23 + #include "xfs_mount.h" 20 24 #include "xfs_bmap_btree.h" 21 25 #include "xfs_inum.h" 22 26 #include "xfs_dinode.h" 23 27 #include "xfs_inode.h" 24 - #include "xfs_ag.h" 25 - #include "xfs_trans.h" 26 - #include "xfs_sb.h" 27 - #include "xfs_mount.h" 28 28 #include "xfs_bmap.h" 29 29 #include "xfs_bmap_util.h" 30 30 #include "xfs_alloc.h"
+5 -4
fs/xfs/xfs_fsops.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_types.h" 21 - #include "xfs_format.h" 22 20 #include "xfs_shared.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_format.h" 23 + #include "xfs_trans_resv.h" 25 24 #include "xfs_sb.h" 26 25 #include "xfs_ag.h" 27 26 #include "xfs_mount.h" ··· 29 30 #include "xfs_ialloc_btree.h" 30 31 #include "xfs_dinode.h" 31 32 #include "xfs_inode.h" 33 + #include "xfs_trans.h" 32 34 #include "xfs_inode_item.h" 33 35 #include "xfs_btree.h" 34 36 #include "xfs_error.h" ··· 41 41 #include "xfs_rtalloc.h" 42 42 #include "xfs_filestream.h" 43 43 #include "xfs_trace.h" 44 + #include "xfs_log.h" 44 45 45 46 /* 46 47 * File system operations
+4 -3
fs/xfs/xfs_ialloc.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 22 24 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 25 #include "xfs_inum.h" 25 - #include "xfs_trans.h" 26 26 #include "xfs_sb.h" 27 27 #include "xfs_ag.h" 28 28 #include "xfs_mount.h" ··· 38 38 #include "xfs_error.h" 39 39 #include "xfs_bmap.h" 40 40 #include "xfs_cksum.h" 41 + #include "xfs_trans.h" 41 42 #include "xfs_buf_item.h" 42 43 #include "xfs_icreate_item.h" 43 44 #include "xfs_icache.h"
+3 -3
fs/xfs/xfs_ialloc_btree.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_types.h" 20 + #include "xfs_log_format.h" 21 + #include "xfs_trans_resv.h" 21 22 #include "xfs_bit.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 24 23 #include "xfs_sb.h" 25 24 #include "xfs_ag.h" 26 25 #include "xfs_mount.h" ··· 34 35 #include "xfs_error.h" 35 36 #include "xfs_trace.h" 36 37 #include "xfs_cksum.h" 38 + #include "xfs_trans.h" 37 39 38 40 39 41 STATIC int
+4 -5
fs/xfs/xfs_icache.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_format.h" 21 - #include "xfs_types.h" 22 - #include "xfs_log.h" 23 - #include "xfs_log_priv.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 24 23 #include "xfs_inum.h" 25 - #include "xfs_trans.h" 26 - #include "xfs_trans_priv.h" 27 24 #include "xfs_sb.h" 28 25 #include "xfs_ag.h" 29 26 #include "xfs_mount.h" ··· 29 32 #include "xfs_dinode.h" 30 33 #include "xfs_error.h" 31 34 #include "xfs_filestream.h" 35 + #include "xfs_trans.h" 36 + #include "xfs_trans_priv.h" 32 37 #include "xfs_inode_item.h" 33 38 #include "xfs_quota.h" 34 39 #include "xfs_trace.h"
+3 -2
fs/xfs/xfs_icreate_item.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_shared.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 21 23 #include "xfs_bit.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 24 24 #include "xfs_sb.h" 25 25 #include "xfs_ag.h" 26 26 #include "xfs_mount.h" 27 + #include "xfs_trans.h" 27 28 #include "xfs_trans_priv.h" 28 29 #include "xfs_error.h" 29 30 #include "xfs_icreate_item.h"
+7 -5
fs/xfs/xfs_inode.c
··· 19 19 20 20 #include "xfs.h" 21 21 #include "xfs_fs.h" 22 - #include "xfs_format.h" 23 22 #include "xfs_shared.h" 24 - #include "xfs_log.h" 23 + #include "xfs_format.h" 24 + #include "xfs_log_format.h" 25 + #include "xfs_trans_resv.h" 25 26 #include "xfs_inum.h" 26 - #include "xfs_trans.h" 27 - #include "xfs_trans_space.h" 28 - #include "xfs_trans_priv.h" 29 27 #include "xfs_sb.h" 30 28 #include "xfs_ag.h" 31 29 #include "xfs_mount.h" ··· 37 39 #include "xfs_attr.h" 38 40 #include "xfs_dinode.h" 39 41 #include "xfs_inode.h" 42 + #include "xfs_trans_space.h" 43 + #include "xfs_trans.h" 40 44 #include "xfs_buf_item.h" 41 45 #include "xfs_inode_item.h" 42 46 #include "xfs_btree.h" ··· 53 53 #include "xfs_trace.h" 54 54 #include "xfs_icache.h" 55 55 #include "xfs_symlink.h" 56 + #include "xfs_trans_priv.h" 57 + #include "xfs_log.h" 56 58 57 59 kmem_zone_t *xfs_inode_zone; 58 60
+4 -3
fs/xfs/xfs_inode_buf.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 24 24 #include "xfs_sb.h" 25 25 #include "xfs_ag.h" 26 26 #include "xfs_mount.h" ··· 32 32 #include "xfs_cksum.h" 33 33 #include "xfs_icache.h" 34 34 #include "xfs_ialloc.h" 35 + #include "xfs_trans.h" 35 36 36 37 /* 37 38 * Check that none of the inode's in the buffer have a next
+3 -3
fs/xfs/xfs_inode_fork.c
··· 20 20 #include "xfs.h" 21 21 #include "xfs_fs.h" 22 22 #include "xfs_format.h" 23 - #include "xfs_log.h" 23 + #include "xfs_log_format.h" 24 + #include "xfs_trans_resv.h" 24 25 #include "xfs_inum.h" 25 - #include "xfs_trans.h" 26 - #include "xfs_trans_priv.h" 27 26 #include "xfs_sb.h" 28 27 #include "xfs_ag.h" 29 28 #include "xfs_mount.h" ··· 32 33 #include "xfs_attr_sf.h" 33 34 #include "xfs_dinode.h" 34 35 #include "xfs_inode.h" 36 + #include "xfs_trans.h" 35 37 #include "xfs_buf_item.h" 36 38 #include "xfs_inode_item.h" 37 39 #include "xfs_btree.h"
+4 -4
fs/xfs/xfs_inode_item.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_types.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 20 + #include "xfs_log_format.h" 21 + #include "xfs_trans_resv.h" 23 22 #include "xfs_sb.h" 24 23 #include "xfs_ag.h" 25 24 #include "xfs_mount.h" 26 - #include "xfs_trans_priv.h" 27 25 #include "xfs_bmap_btree.h" 28 26 #include "xfs_dinode.h" 29 27 #include "xfs_inode.h" 28 + #include "xfs_trans.h" 30 29 #include "xfs_inode_item.h" 31 30 #include "xfs_error.h" 32 31 #include "xfs_trace.h" 32 + #include "xfs_trans_priv.h" 33 33 34 34 35 35 kmem_zone_t *xfs_ili_zone; /* inode log item zone */
+4 -3
fs/xfs/xfs_ioctl.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 24 24 #include "xfs_sb.h" 25 25 #include "xfs_ag.h" 26 26 #include "xfs_alloc.h" ··· 35 35 #include "xfs_attr.h" 36 36 #include "xfs_bmap.h" 37 37 #include "xfs_bmap_util.h" 38 + #include "xfs_trans.h" 38 39 #include "xfs_buf_item.h" 39 40 #include "xfs_fsops.h" 40 41 #include "xfs_discard.h"
+2 -2
fs/xfs/xfs_ioctl32.c
··· 22 22 #include <asm/uaccess.h> 23 23 #include "xfs.h" 24 24 #include "xfs_fs.h" 25 - #include "xfs_log.h" 26 - #include "xfs_trans.h" 25 + #include "xfs_log_format.h" 26 + #include "xfs_trans_resv.h" 27 27 #include "xfs_sb.h" 28 28 #include "xfs_ag.h" 29 29 #include "xfs_mount.h"
+6 -5
fs/xfs/xfs_iomap.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 24 24 #include "xfs_sb.h" 25 25 #include "xfs_ag.h" 26 - #include "xfs_alloc.h" 27 - #include "xfs_quota.h" 28 26 #include "xfs_mount.h" 29 27 #include "xfs_bmap_btree.h" 30 28 #include "xfs_alloc_btree.h" 31 29 #include "xfs_ialloc_btree.h" 32 30 #include "xfs_dinode.h" 33 31 #include "xfs_inode.h" 32 + #include "xfs_trans.h" 34 33 #include "xfs_inode_item.h" 34 + #include "xfs_alloc.h" 35 + #include "xfs_quota.h" 35 36 #include "xfs_btree.h" 36 37 #include "xfs_bmap.h" 37 38 #include "xfs_bmap_util.h"
+7 -6
fs/xfs/xfs_iops.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 22 - #include "xfs_acl.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 25 24 #include "xfs_sb.h" 26 25 #include "xfs_ag.h" 27 - #include "xfs_alloc.h" 28 - #include "xfs_quota.h" 29 26 #include "xfs_mount.h" 30 27 #include "xfs_da_format.h" 31 28 #include "xfs_bmap_btree.h" ··· 30 33 #include "xfs_inode.h" 31 34 #include "xfs_bmap.h" 32 35 #include "xfs_bmap_util.h" 36 + #include "xfs_acl.h" 37 + #include "xfs_alloc.h" 38 + #include "xfs_quota.h" 33 39 #include "xfs_rtalloc.h" 34 40 #include "xfs_error.h" 35 41 #include "xfs_itable.h" 36 42 #include "xfs_attr.h" 43 + #include "xfs_trans.h" 37 44 #include "xfs_buf_item.h" 38 45 #include "xfs_inode_item.h" 39 46 #include "xfs_trace.h"
+2 -2
fs/xfs/xfs_itable.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_shared.h" 21 - #include "xfs_log.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 22 23 #include "xfs_inum.h" 23 - #include "xfs_trans.h" 24 24 #include "xfs_sb.h" 25 25 #include "xfs_ag.h" 26 26 #include "xfs_mount.h"
+5 -3
fs/xfs/xfs_log.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_shared.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 23 23 #include "xfs_sb.h" 24 24 #include "xfs_ag.h" 25 25 #include "xfs_mount.h" 26 26 #include "xfs_error.h" 27 + #include "xfs_trans.h" 28 + #include "xfs_trans_priv.h" 29 + #include "xfs_log.h" 27 30 #include "xfs_log_priv.h" 28 31 #include "xfs_buf_item.h" 29 32 #include "xfs_bmap_btree.h" 30 33 #include "xfs_alloc_btree.h" 31 34 #include "xfs_ialloc_btree.h" 32 35 #include "xfs_log_recover.h" 33 - #include "xfs_trans_priv.h" 34 36 #include "xfs_dinode.h" 35 37 #include "xfs_inode.h" 36 38 #include "xfs_trace.h"
+2 -8
fs/xfs/xfs_log.h
··· 18 18 #ifndef __XFS_LOG_H__ 19 19 #define __XFS_LOG_H__ 20 20 21 - #include "xfs_log_format.h" 22 - 23 21 struct xfs_log_vec { 24 22 struct xfs_log_vec *lv_next; /* next lv in build list */ 25 23 int lv_niovecs; /* number of iovecs in lv */ ··· 80 82 struct xfs_log_item; 81 83 struct xfs_item_ops; 82 84 struct xfs_trans; 83 - 84 - void xfs_log_item_init(struct xfs_mount *mp, 85 - struct xfs_log_item *item, 86 - int type, 87 - const struct xfs_item_ops *ops); 85 + struct xfs_log_callback; 88 86 89 87 xfs_lsn_t xfs_log_done(struct xfs_mount *mp, 90 88 struct xlog_ticket *ticket, ··· 108 114 void xfs_log_space_wake(struct xfs_mount *mp); 109 115 int xfs_log_notify(struct xfs_mount *mp, 110 116 struct xlog_in_core *iclog, 111 - xfs_log_callback_t *callback_entry); 117 + struct xfs_log_callback *callback_entry); 112 118 int xfs_log_release_iclog(struct xfs_mount *mp, 113 119 struct xlog_in_core *iclog); 114 120 int xfs_log_reserve(struct xfs_mount *mp,
+6 -4
fs/xfs/xfs_log_cil.c
··· 17 17 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 + #include "xfs_log_format.h" 20 21 #include "xfs_shared.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 23 - #include "xfs_trans_priv.h" 24 - #include "xfs_log_priv.h" 22 + #include "xfs_trans_resv.h" 25 23 #include "xfs_sb.h" 26 24 #include "xfs_ag.h" 27 25 #include "xfs_mount.h" ··· 27 29 #include "xfs_alloc.h" 28 30 #include "xfs_extent_busy.h" 29 31 #include "xfs_discard.h" 32 + #include "xfs_trans.h" 33 + #include "xfs_trans_priv.h" 34 + #include "xfs_log.h" 35 + #include "xfs_log_priv.h" 30 36 31 37 /* 32 38 * Allocate a new ticket. Failing to get a new ticket makes it really hard to
+4 -3
fs/xfs/xfs_log_priv.h
··· 22 22 struct xlog; 23 23 struct xlog_ticket; 24 24 struct xfs_mount; 25 + struct xfs_log_callback; 25 26 26 27 /* 27 28 * Flags for log structure ··· 228 227 229 228 /* Callback structures need their own cacheline */ 230 229 spinlock_t ic_callback_lock ____cacheline_aligned_in_smp; 231 - xfs_log_callback_t *ic_callback; 232 - xfs_log_callback_t **ic_callback_tail; 230 + struct xfs_log_callback *ic_callback; 231 + struct xfs_log_callback **ic_callback_tail; 233 232 234 233 /* reference counts need their own cacheline */ 235 234 atomic_t ic_refcnt ____cacheline_aligned_in_smp; ··· 255 254 int space_used; /* aggregate size of regions */ 256 255 struct list_head busy_extents; /* busy extents in chkpt */ 257 256 struct xfs_log_vec *lv_chain; /* logvecs being pushed */ 258 - xfs_log_callback_t log_cb; /* completion callback hook. */ 257 + struct xfs_log_callback log_cb; /* completion callback hook. */ 259 258 struct list_head committing; /* ctx committing list */ 260 259 }; 261 260
+5 -8
fs/xfs/xfs_log_recover.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 22 24 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 25 #include "xfs_inum.h" 25 - #include "xfs_trans.h" 26 26 #include "xfs_sb.h" 27 27 #include "xfs_ag.h" 28 28 #include "xfs_mount.h" ··· 34 34 #include "xfs_btree.h" 35 35 #include "xfs_dinode.h" 36 36 #include "xfs_inode.h" 37 + #include "xfs_trans.h" 37 38 #include "xfs_inode_item.h" 38 39 #include "xfs_alloc.h" 39 40 #include "xfs_ialloc.h" 41 + #include "xfs_log.h" 40 42 #include "xfs_log_priv.h" 41 - #include "xfs_buf_item.h" 42 43 #include "xfs_log_recover.h" 43 44 #include "xfs_extfree_item.h" 44 45 #include "xfs_trans_priv.h" ··· 47 46 #include "xfs_cksum.h" 48 47 #include "xfs_trace.h" 49 48 #include "xfs_icache.h" 50 - #include "xfs_icreate_item.h" 51 49 52 50 /* Need all the magic numbers and buffer ops structures from these headers */ 53 - #include "xfs_symlink.h" 54 51 #include "xfs_da_btree.h" 55 52 #include "xfs_dir2.h" 56 - #include "xfs_attr_leaf.h" 57 - #include "xfs_attr_remote.h" 58 53 59 54 #define BLK_AVG(blk1, blk2) ((blk1+blk2) >> 1) 60 55
+2 -2
fs/xfs/xfs_log_rlimit.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_shared.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 23 23 #include "xfs_ag.h" 24 24 #include "xfs_sb.h" 25 25 #include "xfs_mount.h"
+2 -3
fs/xfs/xfs_message.c
··· 17 17 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_types.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 20 + #include "xfs_log_format.h" 21 + #include "xfs_trans_resv.h" 23 22 #include "xfs_sb.h" 24 23 #include "xfs_ag.h" 25 24 #include "xfs_mount.h"
+6 -4
fs/xfs/xfs_mount.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 22 24 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 25 #include "xfs_inum.h" 25 - #include "xfs_trans.h" 26 - #include "xfs_trans_priv.h" 27 26 #include "xfs_sb.h" 28 27 #include "xfs_ag.h" 29 28 #include "xfs_mount.h" 30 29 #include "xfs_da_format.h" 30 + #include "xfs_trans.h" 31 + #include "xfs_trans_priv.h" 32 + #include "xfs_log.h" 31 33 #include "xfs_dir2.h" 32 34 #include "xfs_bmap_btree.h" 33 35 #include "xfs_alloc_btree.h"
+5 -4
fs/xfs/xfs_qm.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_format.h" 21 + #include "xfs_log_format.h" 21 22 #include "xfs_shared.h" 23 + #include "xfs_trans_resv.h" 22 24 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 25 #include "xfs_sb.h" 26 26 #include "xfs_ag.h" 27 - #include "xfs_alloc.h" 28 - #include "xfs_quota.h" 29 27 #include "xfs_mount.h" 30 28 #include "xfs_bmap_btree.h" 31 29 #include "xfs_ialloc_btree.h" ··· 31 33 #include "xfs_inode.h" 32 34 #include "xfs_ialloc.h" 33 35 #include "xfs_itable.h" 36 + #include "xfs_alloc.h" 34 37 #include "xfs_rtalloc.h" 38 + #include "xfs_quota.h" 35 39 #include "xfs_error.h" 36 40 #include "xfs_bmap.h" 37 41 #include "xfs_attr.h" 42 + #include "xfs_trans.h" 38 43 #include "xfs_buf_item.h" 39 44 #include "xfs_trans_space.h" 40 45 #include "xfs_qm.h"
+3 -2
fs/xfs/xfs_qm_bhv.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_format.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 23 23 #include "xfs_sb.h" 24 24 #include "xfs_ag.h" 25 25 #include "xfs_alloc.h" ··· 32 32 #include "xfs_rtalloc.h" 33 33 #include "xfs_error.h" 34 34 #include "xfs_attr.h" 35 + #include "xfs_trans.h" 35 36 #include "xfs_buf_item.h" 36 37 #include "xfs_qm.h" 37 38
+4 -3
fs/xfs/xfs_qm_syscalls.c
··· 20 20 21 21 #include "xfs.h" 22 22 #include "xfs_fs.h" 23 - #include "xfs_format.h" 24 23 #include "xfs_shared.h" 24 + #include "xfs_format.h" 25 + #include "xfs_log_format.h" 26 + #include "xfs_trans_resv.h" 25 27 #include "xfs_bit.h" 26 - #include "xfs_log.h" 27 - #include "xfs_trans.h" 28 28 #include "xfs_sb.h" 29 29 #include "xfs_ag.h" 30 30 #include "xfs_alloc.h" ··· 32 32 #include "xfs_mount.h" 33 33 #include "xfs_bmap_btree.h" 34 34 #include "xfs_inode.h" 35 + #include "xfs_trans.h" 35 36 #include "xfs_inode_item.h" 36 37 #include "xfs_itable.h" 37 38 #include "xfs_bmap.h"
+1 -1
fs/xfs/xfs_quotaops.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_format.h" 20 + #include "xfs_log_format.h" 20 21 #include "xfs_trans_resv.h" 21 - #include "xfs_log.h" 22 22 #include "xfs_sb.h" 23 23 #include "xfs_ag.h" 24 24 #include "xfs_mount.h"
+4 -3
fs/xfs/xfs_rtalloc.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 22 24 #include "xfs_bit.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 25 25 #include "xfs_sb.h" 26 26 #include "xfs_ag.h" 27 27 #include "xfs_mount.h" ··· 34 34 #include "xfs_rtalloc.h" 35 35 #include "xfs_fsops.h" 36 36 #include "xfs_error.h" 37 + #include "xfs_trans.h" 37 38 #include "xfs_inode_item.h" 38 39 #include "xfs_trans_space.h" 39 40 #include "xfs_trace.h"
+4 -3
fs/xfs/xfs_sb.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_format.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 21 23 #include "xfs_bit.h" 22 - #include "xfs_log.h" 23 24 #include "xfs_inum.h" 24 - #include "xfs_trans.h" 25 - #include "xfs_trans_priv.h" 26 25 #include "xfs_sb.h" 27 26 #include "xfs_ag.h" 28 27 #include "xfs_mount.h" ··· 43 44 #include "xfs_fsops.h" 44 45 #include "xfs_trace.h" 45 46 #include "xfs_cksum.h" 47 + #include "xfs_trans.h" 48 + #include "xfs_trans_priv.h" 46 49 #include "xfs_buf_item.h" 47 50 48 51 /*
+5 -3
fs/xfs/xfs_super.c
··· 17 17 */ 18 18 19 19 #include "xfs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 22 - #include "xfs_log.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 23 24 #include "xfs_inum.h" 24 - #include "xfs_trans.h" 25 25 #include "xfs_sb.h" 26 26 #include "xfs_ag.h" 27 27 #include "xfs_alloc.h" ··· 41 41 #include "xfs_itable.h" 42 42 #include "xfs_fsops.h" 43 43 #include "xfs_attr.h" 44 + #include "xfs_trans.h" 44 45 #include "xfs_buf_item.h" 46 + #include "xfs_log.h" 45 47 #include "xfs_log_priv.h" 46 48 #include "xfs_trans_priv.h" 47 49 #include "xfs_filestream.h"
+5 -3
fs/xfs/xfs_symlink.c
··· 17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 18 */ 19 19 #include "xfs.h" 20 + #include "xfs_shared.h" 20 21 #include "xfs_fs.h" 21 22 #include "xfs_format.h" 22 - #include "xfs_shared.h" 23 + #include "xfs_log_format.h" 24 + #include "xfs_trans_resv.h" 23 25 #include "xfs_bit.h" 24 - #include "xfs_log.h" 25 - #include "xfs_trans.h" 26 26 #include "xfs_sb.h" 27 27 #include "xfs_ag.h" 28 28 #include "xfs_mount.h" ··· 41 41 #include "xfs_trans_space.h" 42 42 #include "xfs_trace.h" 43 43 #include "xfs_symlink.h" 44 + #include "xfs_trans.h" 44 45 #include "xfs_buf_item.h" 46 + #include "xfs_log.h" 45 47 46 48 /* ----- Kernel only functions below ----- */ 47 49 STATIC int
+5 -3
fs/xfs/xfs_trace.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 24 24 #include "xfs_sb.h" 25 25 #include "xfs_ag.h" 26 26 #include "xfs_mount.h" ··· 38 38 #include "xfs_bmap.h" 39 39 #include "xfs_attr.h" 40 40 #include "xfs_attr_leaf.h" 41 + #include "xfs_trans.h" 42 + #include "xfs_log.h" 41 43 #include "xfs_log_priv.h" 42 44 #include "xfs_buf_item.h" 43 45 #include "xfs_quota.h"
+6 -4
fs/xfs/xfs_trans.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_format.h" 22 21 #include "xfs_shared.h" 23 - #include "xfs_log.h" 24 - #include "xfs_trans.h" 22 + #include "xfs_format.h" 23 + #include "xfs_log_format.h" 24 + #include "xfs_trans_resv.h" 25 25 #include "xfs_sb.h" 26 26 #include "xfs_ag.h" 27 27 #include "xfs_mount.h" ··· 38 38 #include "xfs_extent_busy.h" 39 39 #include "xfs_bmap.h" 40 40 #include "xfs_quota.h" 41 - #include "xfs_qm.h" 41 + #include "xfs_trans.h" 42 42 #include "xfs_trans_priv.h" 43 43 #include "xfs_trans_space.h" 44 + #include "xfs_qm.h" 44 45 #include "xfs_inode_item.h" 46 + #include "xfs_log.h" 45 47 #include "xfs_log_priv.h" 46 48 #include "xfs_buf_item.h" 47 49 #include "xfs_trace.h"
+5 -5
fs/xfs/xfs_trans.h
··· 18 18 #ifndef __XFS_TRANS_H__ 19 19 #define __XFS_TRANS_H__ 20 20 21 - struct xfs_log_item; 22 - 23 - #include "xfs_trans_resv.h" 24 - 25 21 /* kernel only transaction subsystem defines */ 26 22 27 23 struct xfs_buf; ··· 73 77 void (*iop_committing)(xfs_log_item_t *, xfs_lsn_t); 74 78 }; 75 79 80 + void xfs_log_item_init(struct xfs_mount *mp, struct xfs_log_item *item, 81 + int type, const struct xfs_item_ops *ops); 82 + 76 83 /* 77 84 * Return values for the iop_push() routines. 78 85 */ ··· 83 84 #define XFS_ITEM_PINNED 1 84 85 #define XFS_ITEM_LOCKED 2 85 86 #define XFS_ITEM_FLUSHING 3 87 + 86 88 87 89 /* 88 90 * This is the structure maintained for every active transaction. ··· 125 125 int64_t t_rextents_delta;/* superblocks rextents chg */ 126 126 int64_t t_rextslog_delta;/* superblocks rextslog chg */ 127 127 struct list_head t_items; /* log item descriptors */ 128 - xfs_trans_header_t t_header; /* header for in-log trans */ 129 128 struct list_head t_busy; /* list of busy extents */ 130 129 unsigned long t_pflags; /* saved process flags state */ 131 130 } xfs_trans_t; ··· 229 230 xfs_fsblock_t, 230 231 xfs_extlen_t); 231 232 int xfs_trans_commit(xfs_trans_t *, uint flags); 233 + int xfs_trans_roll(struct xfs_trans **, struct xfs_inode *); 232 234 void xfs_trans_cancel(xfs_trans_t *, int); 233 235 int xfs_trans_ail_init(struct xfs_mount *); 234 236 void xfs_trans_ail_destroy(struct xfs_mount *);
+4 -3
fs/xfs/xfs_trans_ail.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_types.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 24 23 #include "xfs_sb.h" 25 24 #include "xfs_ag.h" 26 25 #include "xfs_mount.h" 26 + #include "xfs_trans.h" 27 27 #include "xfs_trans_priv.h" 28 28 #include "xfs_trace.h" 29 29 #include "xfs_error.h" 30 + #include "xfs_log.h" 30 31 31 32 #ifdef DEBUG 32 33 /*
+3 -2
fs/xfs/xfs_trans_buf.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_shared.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 23 23 #include "xfs_sb.h" 24 24 #include "xfs_ag.h" 25 25 #include "xfs_mount.h" ··· 28 28 #include "xfs_ialloc_btree.h" 29 29 #include "xfs_dinode.h" 30 30 #include "xfs_inode.h" 31 + #include "xfs_trans.h" 31 32 #include "xfs_buf_item.h" 32 33 #include "xfs_trans_priv.h" 33 34 #include "xfs_error.h"
+4 -3
fs/xfs/xfs_trans_dquot.c
··· 17 17 */ 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 - #include "xfs_format.h" 21 20 #include "xfs_shared.h" 22 - #include "xfs_log.h" 23 - #include "xfs_trans.h" 21 + #include "xfs_format.h" 22 + #include "xfs_log_format.h" 23 + #include "xfs_trans_resv.h" 24 24 #include "xfs_sb.h" 25 25 #include "xfs_ag.h" 26 26 #include "xfs_alloc.h" ··· 33 33 #include "xfs_rtalloc.h" 34 34 #include "xfs_error.h" 35 35 #include "xfs_attr.h" 36 + #include "xfs_trans.h" 36 37 #include "xfs_buf_item.h" 37 38 #include "xfs_trans_priv.h" 38 39 #include "xfs_qm.h"
+3 -2
fs/xfs/xfs_trans_extfree.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_shared.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 23 23 #include "xfs_sb.h" 24 24 #include "xfs_ag.h" 25 25 #include "xfs_mount.h" 26 + #include "xfs_trans.h" 26 27 #include "xfs_trans_priv.h" 27 28 #include "xfs_extfree_item.h" 28 29
+3 -2
fs/xfs/xfs_trans_inode.c
··· 18 18 #include "xfs.h" 19 19 #include "xfs_fs.h" 20 20 #include "xfs_shared.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 21 + #include "xfs_log_format.h" 22 + #include "xfs_trans_resv.h" 23 23 #include "xfs_sb.h" 24 24 #include "xfs_ag.h" 25 25 #include "xfs_mount.h" ··· 29 29 #include "xfs_dinode.h" 30 30 #include "xfs_inode.h" 31 31 #include "xfs_btree.h" 32 + #include "xfs_trans.h" 32 33 #include "xfs_trans_priv.h" 33 34 #include "xfs_inode_item.h" 34 35 #include "xfs_trace.h"
-1
fs/xfs/xfs_trans_priv.h
··· 27 27 28 28 29 29 void xfs_trans_init(struct xfs_mount *); 30 - int xfs_trans_roll(struct xfs_trans **, struct xfs_inode *); 31 30 void xfs_trans_add_item(struct xfs_trans *, struct xfs_log_item *); 32 31 void xfs_trans_del_item(struct xfs_log_item *); 33 32 void xfs_trans_free_items(struct xfs_trans *tp, xfs_lsn_t commit_lsn,
+3 -3
fs/xfs/xfs_trans_resv.c
··· 18 18 */ 19 19 #include "xfs.h" 20 20 #include "xfs_fs.h" 21 - #include "xfs_format.h" 22 21 #include "xfs_shared.h" 23 - #include "xfs_log.h" 22 + #include "xfs_format.h" 23 + #include "xfs_log_format.h" 24 24 #include "xfs_trans_resv.h" 25 - #include "xfs_trans.h" 26 25 #include "xfs_sb.h" 27 26 #include "xfs_ag.h" 28 27 #include "xfs_mount.h" ··· 40 41 #include "xfs_bmap.h" 41 42 #include "xfs_bmap_util.h" 42 43 #include "xfs_quota.h" 44 + #include "xfs_trans.h" 43 45 #include "xfs_qm.h" 44 46 #include "xfs_trans_space.h" 45 47 #include "xfs_trace.h"
+1 -2
fs/xfs/xfs_xattr.c
··· 18 18 19 19 #include "xfs.h" 20 20 #include "xfs_log_format.h" 21 - #include "xfs_log.h" 22 - #include "xfs_trans.h" 21 + #include "xfs_trans_resv.h" 23 22 #include "xfs_sb.h" 24 23 #include "xfs_ag.h" 25 24 #include "xfs_mount.h"