aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2013-10-22 19:50:10 -0400
committerBen Myers <bpm@sgi.com>2013-10-23 17:17:44 -0400
commit239880ef6454ccff2ba8d762c3f86e8278f0ce1c (patch)
tree9a1203dea8957de0348d241a8bf94580013d915a /fs/xfs
parentd420e5c810bce5debce0238021b410d0ef99cf08 (diff)
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>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_alloc.c6
-rw-r--r--fs/xfs/xfs_alloc_btree.c6
-rw-r--r--fs/xfs/xfs_aops.c7
-rw-r--r--fs/xfs/xfs_attr.c8
-rw-r--r--fs/xfs/xfs_attr_inactive.c8
-rw-r--r--fs/xfs/xfs_attr_leaf.c7
-rw-r--r--fs/xfs/xfs_attr_list.c6
-rw-r--r--fs/xfs/xfs_attr_remote.c7
-rw-r--r--fs/xfs/xfs_bit.c5
-rw-r--r--fs/xfs/xfs_bmap.c7
-rw-r--r--fs/xfs/xfs_bmap_btree.c5
-rw-r--r--fs/xfs/xfs_bmap_util.c9
-rw-r--r--fs/xfs/xfs_btree.c5
-rw-r--r--fs/xfs/xfs_buf.c5
-rw-r--r--fs/xfs/xfs_buf_item.c7
-rw-r--r--fs/xfs/xfs_da_btree.c7
-rw-r--r--fs/xfs/xfs_dir2.c6
-rw-r--r--fs/xfs/xfs_dir2_block.c6
-rw-r--r--fs/xfs/xfs_dir2_data.c6
-rw-r--r--fs/xfs/xfs_dir2_leaf.c6
-rw-r--r--fs/xfs/xfs_dir2_node.c6
-rw-r--r--fs/xfs/xfs_dir2_readdir.c6
-rw-r--r--fs/xfs/xfs_dir2_sf.c6
-rw-r--r--fs/xfs/xfs_discard.c5
-rw-r--r--fs/xfs/xfs_dquot.c10
-rw-r--r--fs/xfs/xfs_dquot_buf.c5
-rw-r--r--fs/xfs/xfs_dquot_item.c6
-rw-r--r--fs/xfs/xfs_error.c5
-rw-r--r--fs/xfs/xfs_export.c7
-rw-r--r--fs/xfs/xfs_extent_busy.c6
-rw-r--r--fs/xfs/xfs_extfree_item.c8
-rw-r--r--fs/xfs/xfs_file.c6
-rw-r--r--fs/xfs/xfs_filestream.c10
-rw-r--r--fs/xfs/xfs_fsops.c9
-rw-r--r--fs/xfs/xfs_ialloc.c7
-rw-r--r--fs/xfs/xfs_ialloc_btree.c6
-rw-r--r--fs/xfs/xfs_icache.c9
-rw-r--r--fs/xfs/xfs_icreate_item.c5
-rw-r--r--fs/xfs/xfs_inode.c12
-rw-r--r--fs/xfs/xfs_inode_buf.c7
-rw-r--r--fs/xfs/xfs_inode_fork.c6
-rw-r--r--fs/xfs/xfs_inode_item.c8
-rw-r--r--fs/xfs/xfs_ioctl.c7
-rw-r--r--fs/xfs/xfs_ioctl32.c4
-rw-r--r--fs/xfs/xfs_iomap.c11
-rw-r--r--fs/xfs/xfs_iops.c13
-rw-r--r--fs/xfs/xfs_itable.c4
-rw-r--r--fs/xfs/xfs_log.c8
-rw-r--r--fs/xfs/xfs_log.h10
-rw-r--r--fs/xfs/xfs_log_cil.c10
-rw-r--r--fs/xfs/xfs_log_priv.h7
-rw-r--r--fs/xfs/xfs_log_recover.c13
-rw-r--r--fs/xfs/xfs_log_rlimit.c4
-rw-r--r--fs/xfs/xfs_message.c5
-rw-r--r--fs/xfs/xfs_mount.c10
-rw-r--r--fs/xfs/xfs_qm.c9
-rw-r--r--fs/xfs/xfs_qm_bhv.c5
-rw-r--r--fs/xfs/xfs_qm_syscalls.c7
-rw-r--r--fs/xfs/xfs_quotaops.c2
-rw-r--r--fs/xfs/xfs_rtalloc.c7
-rw-r--r--fs/xfs/xfs_sb.c7
-rw-r--r--fs/xfs/xfs_super.c8
-rw-r--r--fs/xfs/xfs_symlink.c8
-rw-r--r--fs/xfs/xfs_symlink_remote.c5
-rw-r--r--fs/xfs/xfs_trace.c8
-rw-r--r--fs/xfs/xfs_trans.c10
-rw-r--r--fs/xfs/xfs_trans.h10
-rw-r--r--fs/xfs/xfs_trans_ail.c7
-rw-r--r--fs/xfs/xfs_trans_buf.c5
-rw-r--r--fs/xfs/xfs_trans_dquot.c7
-rw-r--r--fs/xfs/xfs_trans_extfree.c5
-rw-r--r--fs/xfs/xfs_trans_inode.c5
-rw-r--r--fs/xfs/xfs_trans_priv.h1
-rw-r--r--fs/xfs/xfs_trans_resv.c6
-rw-r--r--fs/xfs/xfs_xattr.c3
75 files changed, 276 insertions, 239 deletions
diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
index 2bfca06e0ee7..999db7a95663 100644
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
@@ -18,10 +18,10 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h" 20#include "xfs_format.h"
21#include "xfs_log_format.h"
21#include "xfs_shared.h" 22#include "xfs_shared.h"
23#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 24#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_sb.h" 25#include "xfs_sb.h"
26#include "xfs_ag.h" 26#include "xfs_ag.h"
27#include "xfs_mount.h" 27#include "xfs_mount.h"
@@ -36,7 +36,9 @@
36#include "xfs_error.h" 36#include "xfs_error.h"
37#include "xfs_cksum.h" 37#include "xfs_cksum.h"
38#include "xfs_trace.h" 38#include "xfs_trace.h"
39#include "xfs_trans.h"
39#include "xfs_buf_item.h" 40#include "xfs_buf_item.h"
41#include "xfs_log.h"
40 42
41struct workqueue_struct *xfs_alloc_wq; 43struct workqueue_struct *xfs_alloc_wq;
42 44
diff --git a/fs/xfs/xfs_alloc_btree.c b/fs/xfs/xfs_alloc_btree.c
index cafc90251d19..0bd33bfbb789 100644
--- a/fs/xfs/xfs_alloc_btree.c
+++ b/fs/xfs/xfs_alloc_btree.c
@@ -17,9 +17,8 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_types.h" 20#include "xfs_log_format.h"
21#include "xfs_log.h" 21#include "xfs_trans_resv.h"
22#include "xfs_trans.h"
23#include "xfs_sb.h" 22#include "xfs_sb.h"
24#include "xfs_ag.h" 23#include "xfs_ag.h"
25#include "xfs_mount.h" 24#include "xfs_mount.h"
@@ -34,6 +33,7 @@
34#include "xfs_error.h" 33#include "xfs_error.h"
35#include "xfs_trace.h" 34#include "xfs_trace.h"
36#include "xfs_cksum.h" 35#include "xfs_cksum.h"
36#include "xfs_trans.h"
37 37
38 38
39STATIC struct xfs_btree_cur * 39STATIC struct xfs_btree_cur *
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 2c61e9622f57..caa63cb3e2fd 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -16,16 +16,17 @@
16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_format.h"
20#include "xfs_shared.h" 19#include "xfs_shared.h"
20#include "xfs_format.h"
21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
21#include "xfs_sb.h" 23#include "xfs_sb.h"
22#include "xfs_ag.h" 24#include "xfs_ag.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_mount.h" 25#include "xfs_mount.h"
26#include "xfs_bmap_btree.h" 26#include "xfs_bmap_btree.h"
27#include "xfs_dinode.h" 27#include "xfs_dinode.h"
28#include "xfs_inode.h" 28#include "xfs_inode.h"
29#include "xfs_trans.h"
29#include "xfs_inode_item.h" 30#include "xfs_inode_item.h"
30#include "xfs_alloc.h" 31#include "xfs_alloc.h"
31#include "xfs_error.h" 32#include "xfs_error.h"
diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index dd0f48ff8832..ce6f9e0b6c5f 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -17,12 +17,11 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_format.h"
22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 24#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_trans_priv.h"
26#include "xfs_sb.h" 25#include "xfs_sb.h"
27#include "xfs_ag.h" 26#include "xfs_ag.h"
28#include "xfs_mount.h" 27#include "xfs_mount.h"
@@ -33,6 +32,7 @@
33#include "xfs_dinode.h" 32#include "xfs_dinode.h"
34#include "xfs_inode.h" 33#include "xfs_inode.h"
35#include "xfs_alloc.h" 34#include "xfs_alloc.h"
35#include "xfs_trans.h"
36#include "xfs_inode_item.h" 36#include "xfs_inode_item.h"
37#include "xfs_bmap.h" 37#include "xfs_bmap.h"
38#include "xfs_bmap_util.h" 38#include "xfs_bmap_util.h"
diff --git a/fs/xfs/xfs_attr_inactive.c b/fs/xfs/xfs_attr_inactive.c
index 60b60c008fb7..45480f5b6aea 100644
--- a/fs/xfs/xfs_attr_inactive.c
+++ b/fs/xfs/xfs_attr_inactive.c
@@ -18,11 +18,11 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_format.h"
22#include "xfs_shared.h" 21#include "xfs_shared.h"
22#include "xfs_format.h"
23#include "xfs_log_format.h"
24#include "xfs_trans_resv.h"
23#include "xfs_bit.h" 25#include "xfs_bit.h"
24#include "xfs_log.h"
25#include "xfs_trans.h"
26#include "xfs_sb.h" 26#include "xfs_sb.h"
27#include "xfs_ag.h" 27#include "xfs_ag.h"
28#include "xfs_mount.h" 28#include "xfs_mount.h"
@@ -36,6 +36,7 @@
36#include "xfs_attr_remote.h" 36#include "xfs_attr_remote.h"
37#include "xfs_dinode.h" 37#include "xfs_dinode.h"
38#include "xfs_inode.h" 38#include "xfs_inode.h"
39#include "xfs_trans.h"
39#include "xfs_inode_item.h" 40#include "xfs_inode_item.h"
40#include "xfs_bmap.h" 41#include "xfs_bmap.h"
41#include "xfs_attr.h" 42#include "xfs_attr.h"
@@ -43,7 +44,6 @@
43#include "xfs_error.h" 44#include "xfs_error.h"
44#include "xfs_quota.h" 45#include "xfs_quota.h"
45#include "xfs_trace.h" 46#include "xfs_trace.h"
46#include "xfs_trans_priv.h"
47 47
48/* 48/*
49 * Look at all the extents for this logical region, 49 * Look at all the extents for this logical region,
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
index 94838fe67386..c10c70c88ec9 100644
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -18,11 +18,9 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_types.h" 21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 23#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_trans_priv.h"
26#include "xfs_sb.h" 24#include "xfs_sb.h"
27#include "xfs_ag.h" 25#include "xfs_ag.h"
28#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -37,6 +35,7 @@
37#include "xfs_attr_remote.h" 35#include "xfs_attr_remote.h"
38#include "xfs_dinode.h" 36#include "xfs_dinode.h"
39#include "xfs_inode.h" 37#include "xfs_inode.h"
38#include "xfs_trans.h"
40#include "xfs_inode_item.h" 39#include "xfs_inode_item.h"
41#include "xfs_bmap.h" 40#include "xfs_bmap.h"
42#include "xfs_attr.h" 41#include "xfs_attr.h"
diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 8ba8e4b5e310..a319eb4d123f 100644
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -18,10 +18,9 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_types.h" 21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 23#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_sb.h" 24#include "xfs_sb.h"
26#include "xfs_ag.h" 25#include "xfs_ag.h"
27#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -36,6 +35,7 @@
36#include "xfs_attr_remote.h" 35#include "xfs_attr_remote.h"
37#include "xfs_dinode.h" 36#include "xfs_dinode.h"
38#include "xfs_inode.h" 37#include "xfs_inode.h"
38#include "xfs_trans.h"
39#include "xfs_inode_item.h" 39#include "xfs_inode_item.h"
40#include "xfs_bmap.h" 40#include "xfs_bmap.h"
41#include "xfs_attr.h" 41#include "xfs_attr.h"
diff --git a/fs/xfs/xfs_attr_remote.c b/fs/xfs/xfs_attr_remote.c
index 578f21b70875..1407191f90c3 100644
--- a/fs/xfs/xfs_attr_remote.c
+++ b/fs/xfs/xfs_attr_remote.c
@@ -18,11 +18,9 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_types.h" 21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 23#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_trans_priv.h"
26#include "xfs_sb.h" 24#include "xfs_sb.h"
27#include "xfs_ag.h" 25#include "xfs_ag.h"
28#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -33,6 +31,7 @@
33#include "xfs_dinode.h" 31#include "xfs_dinode.h"
34#include "xfs_inode.h" 32#include "xfs_inode.h"
35#include "xfs_alloc.h" 33#include "xfs_alloc.h"
34#include "xfs_trans.h"
36#include "xfs_inode_item.h" 35#include "xfs_inode_item.h"
37#include "xfs_bmap.h" 36#include "xfs_bmap.h"
38#include "xfs_bmap_util.h" 37#include "xfs_bmap_util.h"
diff --git a/fs/xfs/xfs_bit.c b/fs/xfs/xfs_bit.c
index 48228848f5ae..16ce44a2b43e 100644
--- a/fs/xfs/xfs_bit.c
+++ b/fs/xfs/xfs_bit.c
@@ -16,10 +16,7 @@
16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_bit.h" 19#include "xfs_log_format.h"
20#include "xfs_log.h"
21#include "xfs_trans.h"
22#include "xfs_buf_item.h"
23 20
24/* 21/*
25 * XFS bit manipulation routines, used in non-realtime code. 22 * XFS bit manipulation routines, used in non-realtime code.
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
index b5cb377bd2bb..c3756ac09658 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
@@ -17,12 +17,12 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_format.h"
22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 24#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_inum.h" 25#include "xfs_inum.h"
25#include "xfs_trans.h"
26#include "xfs_sb.h" 26#include "xfs_sb.h"
27#include "xfs_ag.h" 27#include "xfs_ag.h"
28#include "xfs_mount.h" 28#include "xfs_mount.h"
@@ -37,6 +37,7 @@
37#include "xfs_btree.h" 37#include "xfs_btree.h"
38#include "xfs_mount.h" 38#include "xfs_mount.h"
39#include "xfs_itable.h" 39#include "xfs_itable.h"
40#include "xfs_trans.h"
40#include "xfs_inode_item.h" 41#include "xfs_inode_item.h"
41#include "xfs_extfree_item.h" 42#include "xfs_extfree_item.h"
42#include "xfs_alloc.h" 43#include "xfs_alloc.h"
diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c
index bb8de8e399c4..89ef4e67ff54 100644
--- a/fs/xfs/xfs_bmap_btree.c
+++ b/fs/xfs/xfs_bmap_btree.c
@@ -18,9 +18,9 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h" 20#include "xfs_format.h"
21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
21#include "xfs_bit.h" 23#include "xfs_bit.h"
22#include "xfs_log.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 24#include "xfs_sb.h"
25#include "xfs_ag.h" 25#include "xfs_ag.h"
26#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -29,6 +29,7 @@
29#include "xfs_ialloc_btree.h" 29#include "xfs_ialloc_btree.h"
30#include "xfs_dinode.h" 30#include "xfs_dinode.h"
31#include "xfs_inode.h" 31#include "xfs_inode.h"
32#include "xfs_trans.h"
32#include "xfs_inode_item.h" 33#include "xfs_inode_item.h"
33#include "xfs_alloc.h" 34#include "xfs_alloc.h"
34#include "xfs_btree.h" 35#include "xfs_btree.h"
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 74ff478b9b75..271c0d6ceafd 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -18,12 +18,11 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_format.h"
22#include "xfs_shared.h" 21#include "xfs_shared.h"
22#include "xfs_format.h"
23#include "xfs_log_format.h"
24#include "xfs_trans_resv.h"
23#include "xfs_bit.h" 25#include "xfs_bit.h"
24#include "xfs_log.h"
25#include "xfs_inum.h"
26#include "xfs_trans.h"
27#include "xfs_sb.h" 26#include "xfs_sb.h"
28#include "xfs_ag.h" 27#include "xfs_ag.h"
29#include "xfs_mount.h" 28#include "xfs_mount.h"
@@ -34,6 +33,7 @@
34#include "xfs_dinode.h" 33#include "xfs_dinode.h"
35#include "xfs_inode.h" 34#include "xfs_inode.h"
36#include "xfs_btree.h" 35#include "xfs_btree.h"
36#include "xfs_trans.h"
37#include "xfs_extfree_item.h" 37#include "xfs_extfree_item.h"
38#include "xfs_alloc.h" 38#include "xfs_alloc.h"
39#include "xfs_bmap.h" 39#include "xfs_bmap.h"
@@ -44,6 +44,7 @@
44#include "xfs_trans_space.h" 44#include "xfs_trans_space.h"
45#include "xfs_trace.h" 45#include "xfs_trace.h"
46#include "xfs_icache.h" 46#include "xfs_icache.h"
47#include "xfs_log.h"
47 48
48/* Kernel only BMAP related definitions and functions */ 49/* Kernel only BMAP related definitions and functions */
49 50
diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index 1a297e26e26c..08365117a933 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -18,9 +18,9 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
21#include "xfs_bit.h" 23#include "xfs_bit.h"
22#include "xfs_log.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 24#include "xfs_sb.h"
25#include "xfs_ag.h" 25#include "xfs_ag.h"
26#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -29,6 +29,7 @@
29#include "xfs_ialloc_btree.h" 29#include "xfs_ialloc_btree.h"
30#include "xfs_dinode.h" 30#include "xfs_dinode.h"
31#include "xfs_inode.h" 31#include "xfs_inode.h"
32#include "xfs_trans.h"
32#include "xfs_inode_item.h" 33#include "xfs_inode_item.h"
33#include "xfs_buf_item.h" 34#include "xfs_buf_item.h"
34#include "xfs_btree.h" 35#include "xfs_btree.h"
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 75e4ea7b109a..c7f0b77dcb00 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -34,12 +34,13 @@
34#include <linux/backing-dev.h> 34#include <linux/backing-dev.h>
35#include <linux/freezer.h> 35#include <linux/freezer.h>
36 36
37#include "xfs_sb.h" 37#include "xfs_log_format.h"
38#include "xfs_trans_resv.h" 38#include "xfs_trans_resv.h"
39#include "xfs_log.h" 39#include "xfs_sb.h"
40#include "xfs_ag.h" 40#include "xfs_ag.h"
41#include "xfs_mount.h" 41#include "xfs_mount.h"
42#include "xfs_trace.h" 42#include "xfs_trace.h"
43#include "xfs_log.h"
43 44
44static kmem_zone_t *xfs_buf_zone; 45static kmem_zone_t *xfs_buf_zone;
45 46
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index f1d85cfc0a54..b6d20c55282b 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -17,17 +17,18 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_types.h" 20#include "xfs_log_format.h"
21#include "xfs_trans_resv.h"
21#include "xfs_bit.h" 22#include "xfs_bit.h"
22#include "xfs_log.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 23#include "xfs_sb.h"
25#include "xfs_ag.h" 24#include "xfs_ag.h"
26#include "xfs_mount.h" 25#include "xfs_mount.h"
26#include "xfs_trans.h"
27#include "xfs_buf_item.h" 27#include "xfs_buf_item.h"
28#include "xfs_trans_priv.h" 28#include "xfs_trans_priv.h"
29#include "xfs_error.h" 29#include "xfs_error.h"
30#include "xfs_trace.h" 30#include "xfs_trace.h"
31#include "xfs_log.h"
31 32
32 33
33kmem_zone_t *xfs_buf_item_zone; 34kmem_zone_t *xfs_buf_item_zone;
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 4ec68c361c4c..377011195975 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -18,11 +18,11 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_format.h"
22#include "xfs_shared.h" 21#include "xfs_shared.h"
22#include "xfs_format.h"
23#include "xfs_log_format.h"
24#include "xfs_trans_resv.h"
23#include "xfs_bit.h" 25#include "xfs_bit.h"
24#include "xfs_log.h"
25#include "xfs_trans.h"
26#include "xfs_sb.h" 26#include "xfs_sb.h"
27#include "xfs_ag.h" 27#include "xfs_ag.h"
28#include "xfs_mount.h" 28#include "xfs_mount.h"
@@ -33,6 +33,7 @@
33#include "xfs_dir2_priv.h" 33#include "xfs_dir2_priv.h"
34#include "xfs_dinode.h" 34#include "xfs_dinode.h"
35#include "xfs_inode.h" 35#include "xfs_inode.h"
36#include "xfs_trans.h"
36#include "xfs_inode_item.h" 37#include "xfs_inode_item.h"
37#include "xfs_alloc.h" 38#include "xfs_alloc.h"
38#include "xfs_bmap.h" 39#include "xfs_bmap.h"
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
index f46777fa3077..cef16615f761 100644
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
@@ -17,10 +17,9 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_types.h" 20#include "xfs_log_format.h"
21#include "xfs_log.h" 21#include "xfs_trans_resv.h"
22#include "xfs_inum.h" 22#include "xfs_inum.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 23#include "xfs_sb.h"
25#include "xfs_ag.h" 24#include "xfs_ag.h"
26#include "xfs_mount.h" 25#include "xfs_mount.h"
@@ -30,6 +29,7 @@
30#include "xfs_alloc_btree.h" 29#include "xfs_alloc_btree.h"
31#include "xfs_dinode.h" 30#include "xfs_dinode.h"
32#include "xfs_inode.h" 31#include "xfs_inode.h"
32#include "xfs_trans.h"
33#include "xfs_inode_item.h" 33#include "xfs_inode_item.h"
34#include "xfs_bmap.h" 34#include "xfs_bmap.h"
35#include "xfs_dir2.h" 35#include "xfs_dir2.h"
diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index 5f172730bfa3..6c7cd3ce9e72 100644
--- a/fs/xfs/xfs_dir2_block.c
+++ b/fs/xfs/xfs_dir2_block.c
@@ -18,9 +18,8 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_types.h" 21#include "xfs_log_format.h"
22#include "xfs_log.h" 22#include "xfs_trans_resv.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 23#include "xfs_sb.h"
25#include "xfs_ag.h" 24#include "xfs_ag.h"
26#include "xfs_mount.h" 25#include "xfs_mount.h"
@@ -29,6 +28,7 @@
29#include "xfs_bmap_btree.h" 28#include "xfs_bmap_btree.h"
30#include "xfs_dinode.h" 29#include "xfs_dinode.h"
31#include "xfs_inode.h" 30#include "xfs_inode.h"
31#include "xfs_trans.h"
32#include "xfs_inode_item.h" 32#include "xfs_inode_item.h"
33#include "xfs_bmap.h" 33#include "xfs_bmap.h"
34#include "xfs_buf_item.h" 34#include "xfs_buf_item.h"
diff --git a/fs/xfs/xfs_dir2_data.c b/fs/xfs/xfs_dir2_data.c
index 8cf8034ebab1..3f7edddb8eff 100644
--- a/fs/xfs/xfs_dir2_data.c
+++ b/fs/xfs/xfs_dir2_data.c
@@ -18,9 +18,8 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_types.h" 21#include "xfs_log_format.h"
22#include "xfs_log.h" 22#include "xfs_trans_resv.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 23#include "xfs_sb.h"
25#include "xfs_ag.h" 24#include "xfs_ag.h"
26#include "xfs_mount.h" 25#include "xfs_mount.h"
@@ -32,6 +31,7 @@
32#include "xfs_dir2.h" 31#include "xfs_dir2.h"
33#include "xfs_dir2_priv.h" 32#include "xfs_dir2_priv.h"
34#include "xfs_error.h" 33#include "xfs_error.h"
34#include "xfs_trans.h"
35#include "xfs_buf_item.h" 35#include "xfs_buf_item.h"
36#include "xfs_cksum.h" 36#include "xfs_cksum.h"
37 37
diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c
index d5937dab8f56..44fe4b83ac9b 100644
--- a/fs/xfs/xfs_dir2_leaf.c
+++ b/fs/xfs/xfs_dir2_leaf.c
@@ -18,10 +18,9 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_types.h" 21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 23#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_sb.h" 24#include "xfs_sb.h"
26#include "xfs_ag.h" 25#include "xfs_ag.h"
27#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -35,6 +34,7 @@
35#include "xfs_dir2_priv.h" 34#include "xfs_dir2_priv.h"
36#include "xfs_error.h" 35#include "xfs_error.h"
37#include "xfs_trace.h" 36#include "xfs_trace.h"
37#include "xfs_trans.h"
38#include "xfs_buf_item.h" 38#include "xfs_buf_item.h"
39#include "xfs_cksum.h" 39#include "xfs_cksum.h"
40 40
diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
index 85ff354db4ae..7836f048102e 100644
--- a/fs/xfs/xfs_dir2_node.c
+++ b/fs/xfs/xfs_dir2_node.c
@@ -18,9 +18,8 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_types.h" 21#include "xfs_log_format.h"
22#include "xfs_log.h" 22#include "xfs_trans_resv.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 23#include "xfs_sb.h"
25#include "xfs_ag.h" 24#include "xfs_ag.h"
26#include "xfs_mount.h" 25#include "xfs_mount.h"
@@ -34,6 +33,7 @@
34#include "xfs_dir2_priv.h" 33#include "xfs_dir2_priv.h"
35#include "xfs_error.h" 34#include "xfs_error.h"
36#include "xfs_trace.h" 35#include "xfs_trace.h"
36#include "xfs_trans.h"
37#include "xfs_buf_item.h" 37#include "xfs_buf_item.h"
38#include "xfs_cksum.h" 38#include "xfs_cksum.h"
39 39
diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
index 6b1ffb37654a..048d582525cf 100644
--- a/fs/xfs/xfs_dir2_readdir.c
+++ b/fs/xfs/xfs_dir2_readdir.c
@@ -18,10 +18,9 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_types.h" 21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 23#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_sb.h" 24#include "xfs_sb.h"
26#include "xfs_ag.h" 25#include "xfs_ag.h"
27#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -35,6 +34,7 @@
35#include "xfs_error.h" 34#include "xfs_error.h"
36#include "xfs_trace.h" 35#include "xfs_trace.h"
37#include "xfs_bmap.h" 36#include "xfs_bmap.h"
37#include "xfs_trans.h"
38 38
39/* 39/*
40 * Directory file type support functions 40 * Directory file type support functions
diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
index 8d925963a1f2..ac3bb58b58b9 100644
--- a/fs/xfs/xfs_dir2_sf.c
+++ b/fs/xfs/xfs_dir2_sf.c
@@ -17,9 +17,8 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_types.h" 20#include "xfs_log_format.h"
21#include "xfs_log.h" 21#include "xfs_trans_resv.h"
22#include "xfs_trans.h"
23#include "xfs_sb.h" 22#include "xfs_sb.h"
24#include "xfs_ag.h" 23#include "xfs_ag.h"
25#include "xfs_mount.h" 24#include "xfs_mount.h"
@@ -28,6 +27,7 @@
28#include "xfs_bmap_btree.h" 27#include "xfs_bmap_btree.h"
29#include "xfs_dinode.h" 28#include "xfs_dinode.h"
30#include "xfs_inode.h" 29#include "xfs_inode.h"
30#include "xfs_trans.h"
31#include "xfs_inode_item.h" 31#include "xfs_inode_item.h"
32#include "xfs_error.h" 32#include "xfs_error.h"
33#include "xfs_dir2.h" 33#include "xfs_dir2.h"
diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index 45560ee1a4ba..d38f34cecb40 100644
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -17,8 +17,8 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_format.h" 19#include "xfs_format.h"
20#include "xfs_log.h" 20#include "xfs_log_format.h"
21#include "xfs_trans.h" 21#include "xfs_trans_resv.h"
22#include "xfs_sb.h" 22#include "xfs_sb.h"
23#include "xfs_ag.h" 23#include "xfs_ag.h"
24#include "xfs_mount.h" 24#include "xfs_mount.h"
@@ -33,6 +33,7 @@
33#include "xfs_extent_busy.h" 33#include "xfs_extent_busy.h"
34#include "xfs_discard.h" 34#include "xfs_discard.h"
35#include "xfs_trace.h" 35#include "xfs_trace.h"
36#include "xfs_log.h"
36 37
37STATIC int 38STATIC int
38xfs_trim_extents( 39xfs_trim_extents(
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index f85a893c2398..47a815d4a345 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -18,29 +18,31 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h" 20#include "xfs_format.h"
21#include "xfs_log_format.h"
21#include "xfs_shared.h" 22#include "xfs_shared.h"
23#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 24#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_sb.h" 25#include "xfs_sb.h"
26#include "xfs_ag.h" 26#include "xfs_ag.h"
27#include "xfs_alloc.h"
28#include "xfs_quota.h"
29#include "xfs_mount.h" 27#include "xfs_mount.h"
30#include "xfs_bmap_btree.h" 28#include "xfs_bmap_btree.h"
31#include "xfs_inode.h" 29#include "xfs_inode.h"
32#include "xfs_bmap.h" 30#include "xfs_bmap.h"
33#include "xfs_bmap_util.h" 31#include "xfs_bmap_util.h"
32#include "xfs_alloc.h"
33#include "xfs_quota.h"
34#include "xfs_rtalloc.h" 34#include "xfs_rtalloc.h"
35#include "xfs_error.h" 35#include "xfs_error.h"
36#include "xfs_itable.h" 36#include "xfs_itable.h"
37#include "xfs_attr.h" 37#include "xfs_attr.h"
38#include "xfs_trans.h"
38#include "xfs_buf_item.h" 39#include "xfs_buf_item.h"
39#include "xfs_trans_space.h" 40#include "xfs_trans_space.h"
40#include "xfs_trans_priv.h" 41#include "xfs_trans_priv.h"
41#include "xfs_qm.h" 42#include "xfs_qm.h"
42#include "xfs_cksum.h" 43#include "xfs_cksum.h"
43#include "xfs_trace.h" 44#include "xfs_trace.h"
45#include "xfs_log.h"
44 46
45/* 47/*
46 * Lock order: 48 * Lock order:
diff --git a/fs/xfs/xfs_dquot_buf.c b/fs/xfs/xfs_dquot_buf.c
index ad2c18fbdb05..3e84b3a57f57 100644
--- a/fs/xfs/xfs_dquot_buf.c
+++ b/fs/xfs/xfs_dquot_buf.c
@@ -19,15 +19,16 @@
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_format.h" 21#include "xfs_format.h"
22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 24#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_sb.h" 25#include "xfs_sb.h"
26#include "xfs_ag.h" 26#include "xfs_ag.h"
27#include "xfs_mount.h" 27#include "xfs_mount.h"
28#include "xfs_bmap_btree.h" 28#include "xfs_bmap_btree.h"
29#include "xfs_inode.h" 29#include "xfs_inode.h"
30#include "xfs_quota.h" 30#include "xfs_quota.h"
31#include "xfs_trans.h"
31#include "xfs_qm.h" 32#include "xfs_qm.h"
32#include "xfs_error.h" 33#include "xfs_error.h"
33#include "xfs_cksum.h" 34#include "xfs_cksum.h"
diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c
index e838d84b4e85..f8a47f77c3fa 100644
--- a/fs/xfs/xfs_dquot_item.c
+++ b/fs/xfs/xfs_dquot_item.c
@@ -18,8 +18,8 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h" 20#include "xfs_format.h"
21#include "xfs_log.h" 21#include "xfs_log_format.h"
22#include "xfs_trans.h" 22#include "xfs_trans_resv.h"
23#include "xfs_sb.h" 23#include "xfs_sb.h"
24#include "xfs_ag.h" 24#include "xfs_ag.h"
25#include "xfs_alloc.h" 25#include "xfs_alloc.h"
@@ -32,9 +32,11 @@
32#include "xfs_error.h" 32#include "xfs_error.h"
33#include "xfs_itable.h" 33#include "xfs_itable.h"
34#include "xfs_attr.h" 34#include "xfs_attr.h"
35#include "xfs_trans.h"
35#include "xfs_buf_item.h" 36#include "xfs_buf_item.h"
36#include "xfs_trans_priv.h" 37#include "xfs_trans_priv.h"
37#include "xfs_qm.h" 38#include "xfs_qm.h"
39#include "xfs_log.h"
38 40
39static inline struct xfs_dq_logitem *DQUOT_ITEM(struct xfs_log_item *lip) 41static inline struct xfs_dq_logitem *DQUOT_ITEM(struct xfs_log_item *lip)
40{ 42{
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 40f2985a27bc..d6c188cc7d43 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -17,9 +17,8 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_types.h" 20#include "xfs_log_format.h"
21#include "xfs_log.h" 21#include "xfs_trans_resv.h"
22#include "xfs_trans.h"
23#include "xfs_sb.h" 22#include "xfs_sb.h"
24#include "xfs_ag.h" 23#include "xfs_ag.h"
25#include "xfs_mount.h" 24#include "xfs_mount.h"
diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c
index 96be1d63da9b..8502aee8e65d 100644
--- a/fs/xfs/xfs_export.c
+++ b/fs/xfs/xfs_export.c
@@ -16,9 +16,8 @@
16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_types.h" 19#include "xfs_log_format.h"
20#include "xfs_log.h" 20#include "xfs_trans_resv.h"
21#include "xfs_trans.h"
22#include "xfs_sb.h" 21#include "xfs_sb.h"
23#include "xfs_ag.h" 22#include "xfs_ag.h"
24#include "xfs_mount.h" 23#include "xfs_mount.h"
@@ -27,9 +26,11 @@
27#include "xfs_export.h" 26#include "xfs_export.h"
28#include "xfs_bmap_btree.h" 27#include "xfs_bmap_btree.h"
29#include "xfs_inode.h" 28#include "xfs_inode.h"
29#include "xfs_trans.h"
30#include "xfs_inode_item.h" 30#include "xfs_inode_item.h"
31#include "xfs_trace.h" 31#include "xfs_trace.h"
32#include "xfs_icache.h" 32#include "xfs_icache.h"
33#include "xfs_log.h"
33 34
34/* 35/*
35 * Note that we only accept fileids which are long enough rather than allow 36 * Note that we only accept fileids which are long enough rather than allow
diff --git a/fs/xfs/xfs_extent_busy.c b/fs/xfs/xfs_extent_busy.c
index 74828a7895eb..de462640606f 100644
--- a/fs/xfs/xfs_extent_busy.c
+++ b/fs/xfs/xfs_extent_busy.c
@@ -20,9 +20,9 @@
20#include "xfs.h" 20#include "xfs.h"
21#include "xfs_fs.h" 21#include "xfs_fs.h"
22#include "xfs_format.h" 22#include "xfs_format.h"
23#include "xfs_log_format.h"
23#include "xfs_shared.h" 24#include "xfs_shared.h"
24#include "xfs_log.h" 25#include "xfs_trans_resv.h"
25#include "xfs_trans.h"
26#include "xfs_sb.h" 26#include "xfs_sb.h"
27#include "xfs_ag.h" 27#include "xfs_ag.h"
28#include "xfs_mount.h" 28#include "xfs_mount.h"
@@ -31,6 +31,8 @@
31#include "xfs_inode.h" 31#include "xfs_inode.h"
32#include "xfs_extent_busy.h" 32#include "xfs_extent_busy.h"
33#include "xfs_trace.h" 33#include "xfs_trace.h"
34#include "xfs_trans.h"
35#include "xfs_log.h"
34 36
35void 37void
36xfs_extent_busy_insert( 38xfs_extent_busy_insert(
diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index dc53e8febbbe..3680d04f973f 100644
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -17,14 +17,14 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_types.h" 20#include "xfs_log_format.h"
21#include "xfs_log.h" 21#include "xfs_trans_resv.h"
22#include "xfs_trans.h"
23#include "xfs_buf_item.h"
24#include "xfs_sb.h" 22#include "xfs_sb.h"
25#include "xfs_ag.h" 23#include "xfs_ag.h"
26#include "xfs_mount.h" 24#include "xfs_mount.h"
25#include "xfs_trans.h"
27#include "xfs_trans_priv.h" 26#include "xfs_trans_priv.h"
27#include "xfs_buf_item.h"
28#include "xfs_extfree_item.h" 28#include "xfs_extfree_item.h"
29 29
30 30
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index cc22aa1b7b3b..8b43bfa023af 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -18,10 +18,10 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_log.h" 21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
22#include "xfs_sb.h" 23#include "xfs_sb.h"
23#include "xfs_ag.h" 24#include "xfs_ag.h"
24#include "xfs_trans.h"
25#include "xfs_mount.h" 25#include "xfs_mount.h"
26#include "xfs_da_format.h" 26#include "xfs_da_format.h"
27#include "xfs_da_btree.h" 27#include "xfs_da_btree.h"
@@ -29,6 +29,7 @@
29#include "xfs_alloc.h" 29#include "xfs_alloc.h"
30#include "xfs_dinode.h" 30#include "xfs_dinode.h"
31#include "xfs_inode.h" 31#include "xfs_inode.h"
32#include "xfs_trans.h"
32#include "xfs_inode_item.h" 33#include "xfs_inode_item.h"
33#include "xfs_bmap.h" 34#include "xfs_bmap.h"
34#include "xfs_bmap_util.h" 35#include "xfs_bmap_util.h"
@@ -37,6 +38,7 @@
37#include "xfs_dir2_priv.h" 38#include "xfs_dir2_priv.h"
38#include "xfs_ioctl.h" 39#include "xfs_ioctl.h"
39#include "xfs_trace.h" 40#include "xfs_trace.h"
41#include "xfs_log.h"
40 42
41#include <linux/aio.h> 43#include <linux/aio.h>
42#include <linux/dcache.h> 44#include <linux/dcache.h>
diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index ce78e654d37b..7f2c3c1c8ba4 100644
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -16,15 +16,15 @@
16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17 */ 17 */
18#include "xfs.h" 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#include "xfs_bmap_btree.h" 24#include "xfs_bmap_btree.h"
21#include "xfs_inum.h" 25#include "xfs_inum.h"
22#include "xfs_dinode.h" 26#include "xfs_dinode.h"
23#include "xfs_inode.h" 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#include "xfs_bmap.h" 28#include "xfs_bmap.h"
29#include "xfs_bmap_util.h" 29#include "xfs_bmap_util.h"
30#include "xfs_alloc.h" 30#include "xfs_alloc.h"
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index e5d2c43c65c4..ceaec3165921 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -17,11 +17,10 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_types.h"
21#include "xfs_format.h"
22#include "xfs_shared.h" 20#include "xfs_shared.h"
23#include "xfs_log.h" 21#include "xfs_log_format.h"
24#include "xfs_trans.h" 22#include "xfs_format.h"
23#include "xfs_trans_resv.h"
25#include "xfs_sb.h" 24#include "xfs_sb.h"
26#include "xfs_ag.h" 25#include "xfs_ag.h"
27#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -30,6 +29,7 @@
30#include "xfs_ialloc_btree.h" 29#include "xfs_ialloc_btree.h"
31#include "xfs_dinode.h" 30#include "xfs_dinode.h"
32#include "xfs_inode.h" 31#include "xfs_inode.h"
32#include "xfs_trans.h"
33#include "xfs_inode_item.h" 33#include "xfs_inode_item.h"
34#include "xfs_btree.h" 34#include "xfs_btree.h"
35#include "xfs_error.h" 35#include "xfs_error.h"
@@ -41,6 +41,7 @@
41#include "xfs_rtalloc.h" 41#include "xfs_rtalloc.h"
42#include "xfs_filestream.h" 42#include "xfs_filestream.h"
43#include "xfs_trace.h" 43#include "xfs_trace.h"
44#include "xfs_log.h"
44 45
45/* 46/*
46 * File system operations 47 * File system operations
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index 8530cabf128d..c973ff8c4a7c 100644
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -17,12 +17,12 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_format.h"
22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 24#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_inum.h" 25#include "xfs_inum.h"
25#include "xfs_trans.h"
26#include "xfs_sb.h" 26#include "xfs_sb.h"
27#include "xfs_ag.h" 27#include "xfs_ag.h"
28#include "xfs_mount.h" 28#include "xfs_mount.h"
@@ -38,6 +38,7 @@
38#include "xfs_error.h" 38#include "xfs_error.h"
39#include "xfs_bmap.h" 39#include "xfs_bmap.h"
40#include "xfs_cksum.h" 40#include "xfs_cksum.h"
41#include "xfs_trans.h"
41#include "xfs_buf_item.h" 42#include "xfs_buf_item.h"
42#include "xfs_icreate_item.h" 43#include "xfs_icreate_item.h"
43#include "xfs_icache.h" 44#include "xfs_icache.h"
diff --git a/fs/xfs/xfs_ialloc_btree.c b/fs/xfs/xfs_ialloc_btree.c
index 5448eb6b8c12..2a0b6158e4c4 100644
--- a/fs/xfs/xfs_ialloc_btree.c
+++ b/fs/xfs/xfs_ialloc_btree.c
@@ -17,10 +17,9 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_types.h" 20#include "xfs_log_format.h"
21#include "xfs_trans_resv.h"
21#include "xfs_bit.h" 22#include "xfs_bit.h"
22#include "xfs_log.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 23#include "xfs_sb.h"
25#include "xfs_ag.h" 24#include "xfs_ag.h"
26#include "xfs_mount.h" 25#include "xfs_mount.h"
@@ -35,6 +34,7 @@
35#include "xfs_error.h" 34#include "xfs_error.h"
36#include "xfs_trace.h" 35#include "xfs_trace.h"
37#include "xfs_cksum.h" 36#include "xfs_cksum.h"
37#include "xfs_trans.h"
38 38
39 39
40STATIC int 40STATIC int
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 76a4ecd638c3..6db11556731d 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -18,12 +18,9 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h" 20#include "xfs_format.h"
21#include "xfs_types.h" 21#include "xfs_log_format.h"
22#include "xfs_log.h" 22#include "xfs_trans_resv.h"
23#include "xfs_log_priv.h"
24#include "xfs_inum.h" 23#include "xfs_inum.h"
25#include "xfs_trans.h"
26#include "xfs_trans_priv.h"
27#include "xfs_sb.h" 24#include "xfs_sb.h"
28#include "xfs_ag.h" 25#include "xfs_ag.h"
29#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -32,6 +29,8 @@
32#include "xfs_dinode.h" 29#include "xfs_dinode.h"
33#include "xfs_error.h" 30#include "xfs_error.h"
34#include "xfs_filestream.h" 31#include "xfs_filestream.h"
32#include "xfs_trans.h"
33#include "xfs_trans_priv.h"
35#include "xfs_inode_item.h" 34#include "xfs_inode_item.h"
36#include "xfs_quota.h" 35#include "xfs_quota.h"
37#include "xfs_trace.h" 36#include "xfs_trace.h"
diff --git a/fs/xfs/xfs_icreate_item.c b/fs/xfs/xfs_icreate_item.c
index df8baf38eb85..d2eaccfa73f4 100644
--- a/fs/xfs/xfs_icreate_item.c
+++ b/fs/xfs/xfs_icreate_item.c
@@ -18,12 +18,13 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
21#include "xfs_bit.h" 23#include "xfs_bit.h"
22#include "xfs_log.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 24#include "xfs_sb.h"
25#include "xfs_ag.h" 25#include "xfs_ag.h"
26#include "xfs_mount.h" 26#include "xfs_mount.h"
27#include "xfs_trans.h"
27#include "xfs_trans_priv.h" 28#include "xfs_trans_priv.h"
28#include "xfs_error.h" 29#include "xfs_error.h"
29#include "xfs_icreate_item.h" 30#include "xfs_icreate_item.h"
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 23d78885c743..f0440dcb5d8c 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -19,13 +19,11 @@
19 19
20#include "xfs.h" 20#include "xfs.h"
21#include "xfs_fs.h" 21#include "xfs_fs.h"
22#include "xfs_format.h"
23#include "xfs_shared.h" 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#include "xfs_inum.h" 26#include "xfs_inum.h"
26#include "xfs_trans.h"
27#include "xfs_trans_space.h"
28#include "xfs_trans_priv.h"
29#include "xfs_sb.h" 27#include "xfs_sb.h"
30#include "xfs_ag.h" 28#include "xfs_ag.h"
31#include "xfs_mount.h" 29#include "xfs_mount.h"
@@ -39,6 +37,8 @@
39#include "xfs_attr.h" 37#include "xfs_attr.h"
40#include "xfs_dinode.h" 38#include "xfs_dinode.h"
41#include "xfs_inode.h" 39#include "xfs_inode.h"
40#include "xfs_trans_space.h"
41#include "xfs_trans.h"
42#include "xfs_buf_item.h" 42#include "xfs_buf_item.h"
43#include "xfs_inode_item.h" 43#include "xfs_inode_item.h"
44#include "xfs_btree.h" 44#include "xfs_btree.h"
@@ -53,6 +53,8 @@
53#include "xfs_trace.h" 53#include "xfs_trace.h"
54#include "xfs_icache.h" 54#include "xfs_icache.h"
55#include "xfs_symlink.h" 55#include "xfs_symlink.h"
56#include "xfs_trans_priv.h"
57#include "xfs_log.h"
56 58
57kmem_zone_t *xfs_inode_zone; 59kmem_zone_t *xfs_inode_zone;
58 60
diff --git a/fs/xfs/xfs_inode_buf.c b/fs/xfs/xfs_inode_buf.c
index 65fa56edecf3..c0f974b6cd46 100644
--- a/fs/xfs/xfs_inode_buf.c
+++ b/fs/xfs/xfs_inode_buf.c
@@ -17,10 +17,10 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
22#include "xfs_log.h" 21#include "xfs_format.h"
23#include "xfs_trans.h" 22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
24#include "xfs_sb.h" 24#include "xfs_sb.h"
25#include "xfs_ag.h" 25#include "xfs_ag.h"
26#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -32,6 +32,7 @@
32#include "xfs_cksum.h" 32#include "xfs_cksum.h"
33#include "xfs_icache.h" 33#include "xfs_icache.h"
34#include "xfs_ialloc.h" 34#include "xfs_ialloc.h"
35#include "xfs_trans.h"
35 36
36/* 37/*
37 * Check that none of the inode's in the buffer have a next 38 * Check that none of the inode's in the buffer have a next
diff --git a/fs/xfs/xfs_inode_fork.c b/fs/xfs/xfs_inode_fork.c
index 4fa56fcb38d1..b89b58a3a350 100644
--- a/fs/xfs/xfs_inode_fork.c
+++ b/fs/xfs/xfs_inode_fork.c
@@ -20,10 +20,9 @@
20#include "xfs.h" 20#include "xfs.h"
21#include "xfs_fs.h" 21#include "xfs_fs.h"
22#include "xfs_format.h" 22#include "xfs_format.h"
23#include "xfs_log.h" 23#include "xfs_log_format.h"
24#include "xfs_trans_resv.h"
24#include "xfs_inum.h" 25#include "xfs_inum.h"
25#include "xfs_trans.h"
26#include "xfs_trans_priv.h"
27#include "xfs_sb.h" 26#include "xfs_sb.h"
28#include "xfs_ag.h" 27#include "xfs_ag.h"
29#include "xfs_mount.h" 28#include "xfs_mount.h"
@@ -33,6 +32,7 @@
33#include "xfs_attr_sf.h" 32#include "xfs_attr_sf.h"
34#include "xfs_dinode.h" 33#include "xfs_dinode.h"
35#include "xfs_inode.h" 34#include "xfs_inode.h"
35#include "xfs_trans.h"
36#include "xfs_buf_item.h" 36#include "xfs_buf_item.h"
37#include "xfs_inode_item.h" 37#include "xfs_inode_item.h"
38#include "xfs_btree.h" 38#include "xfs_btree.h"
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 378081109844..9f8e85ef2681 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -17,19 +17,19 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_types.h" 20#include "xfs_log_format.h"
21#include "xfs_log.h" 21#include "xfs_trans_resv.h"
22#include "xfs_trans.h"
23#include "xfs_sb.h" 22#include "xfs_sb.h"
24#include "xfs_ag.h" 23#include "xfs_ag.h"
25#include "xfs_mount.h" 24#include "xfs_mount.h"
26#include "xfs_trans_priv.h"
27#include "xfs_bmap_btree.h" 25#include "xfs_bmap_btree.h"
28#include "xfs_dinode.h" 26#include "xfs_dinode.h"
29#include "xfs_inode.h" 27#include "xfs_inode.h"
28#include "xfs_trans.h"
30#include "xfs_inode_item.h" 29#include "xfs_inode_item.h"
31#include "xfs_error.h" 30#include "xfs_error.h"
32#include "xfs_trace.h" 31#include "xfs_trace.h"
32#include "xfs_trans_priv.h"
33 33
34 34
35kmem_zone_t *xfs_ili_zone; /* inode log item zone */ 35kmem_zone_t *xfs_ili_zone; /* inode log item zone */
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index c6c62d12a934..ea65a73d49ba 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -17,10 +17,10 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
22#include "xfs_log.h" 21#include "xfs_format.h"
23#include "xfs_trans.h" 22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
24#include "xfs_sb.h" 24#include "xfs_sb.h"
25#include "xfs_ag.h" 25#include "xfs_ag.h"
26#include "xfs_alloc.h" 26#include "xfs_alloc.h"
@@ -35,6 +35,7 @@
35#include "xfs_attr.h" 35#include "xfs_attr.h"
36#include "xfs_bmap.h" 36#include "xfs_bmap.h"
37#include "xfs_bmap_util.h" 37#include "xfs_bmap_util.h"
38#include "xfs_trans.h"
38#include "xfs_buf_item.h" 39#include "xfs_buf_item.h"
39#include "xfs_fsops.h" 40#include "xfs_fsops.h"
40#include "xfs_discard.h" 41#include "xfs_discard.h"
diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index f671f7e472ac..1be3333b260c 100644
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -22,8 +22,8 @@
22#include <asm/uaccess.h> 22#include <asm/uaccess.h>
23#include "xfs.h" 23#include "xfs.h"
24#include "xfs_fs.h" 24#include "xfs_fs.h"
25#include "xfs_log.h" 25#include "xfs_log_format.h"
26#include "xfs_trans.h" 26#include "xfs_trans_resv.h"
27#include "xfs_sb.h" 27#include "xfs_sb.h"
28#include "xfs_ag.h" 28#include "xfs_ag.h"
29#include "xfs_mount.h" 29#include "xfs_mount.h"
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index d8fb6dfe75ed..adadf80709b8 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -17,21 +17,22 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
22#include "xfs_log.h" 21#include "xfs_format.h"
23#include "xfs_trans.h" 22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
24#include "xfs_sb.h" 24#include "xfs_sb.h"
25#include "xfs_ag.h" 25#include "xfs_ag.h"
26#include "xfs_alloc.h"
27#include "xfs_quota.h"
28#include "xfs_mount.h" 26#include "xfs_mount.h"
29#include "xfs_bmap_btree.h" 27#include "xfs_bmap_btree.h"
30#include "xfs_alloc_btree.h" 28#include "xfs_alloc_btree.h"
31#include "xfs_ialloc_btree.h" 29#include "xfs_ialloc_btree.h"
32#include "xfs_dinode.h" 30#include "xfs_dinode.h"
33#include "xfs_inode.h" 31#include "xfs_inode.h"
32#include "xfs_trans.h"
34#include "xfs_inode_item.h" 33#include "xfs_inode_item.h"
34#include "xfs_alloc.h"
35#include "xfs_quota.h"
35#include "xfs_btree.h" 36#include "xfs_btree.h"
36#include "xfs_bmap.h" 37#include "xfs_bmap.h"
37#include "xfs_bmap_util.h" 38#include "xfs_bmap_util.h"
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index d046dc8c1925..3f2ae19c8ca0 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -17,15 +17,12 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
22#include "xfs_acl.h" 21#include "xfs_format.h"
23#include "xfs_log.h" 22#include "xfs_log_format.h"
24#include "xfs_trans.h" 23#include "xfs_trans_resv.h"
25#include "xfs_sb.h" 24#include "xfs_sb.h"
26#include "xfs_ag.h" 25#include "xfs_ag.h"
27#include "xfs_alloc.h"
28#include "xfs_quota.h"
29#include "xfs_mount.h" 26#include "xfs_mount.h"
30#include "xfs_da_format.h" 27#include "xfs_da_format.h"
31#include "xfs_bmap_btree.h" 28#include "xfs_bmap_btree.h"
@@ -33,10 +30,14 @@
33#include "xfs_inode.h" 30#include "xfs_inode.h"
34#include "xfs_bmap.h" 31#include "xfs_bmap.h"
35#include "xfs_bmap_util.h" 32#include "xfs_bmap_util.h"
33#include "xfs_acl.h"
34#include "xfs_alloc.h"
35#include "xfs_quota.h"
36#include "xfs_rtalloc.h" 36#include "xfs_rtalloc.h"
37#include "xfs_error.h" 37#include "xfs_error.h"
38#include "xfs_itable.h" 38#include "xfs_itable.h"
39#include "xfs_attr.h" 39#include "xfs_attr.h"
40#include "xfs_trans.h"
40#include "xfs_buf_item.h" 41#include "xfs_buf_item.h"
41#include "xfs_inode_item.h" 42#include "xfs_inode_item.h"
42#include "xfs_trace.h" 43#include "xfs_trace.h"
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 4f50e637f33b..964b1caae085 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -18,9 +18,9 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_log.h" 21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
22#include "xfs_inum.h" 23#include "xfs_inum.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 24#include "xfs_sb.h"
25#include "xfs_ag.h" 25#include "xfs_ag.h"
26#include "xfs_mount.h" 26#include "xfs_mount.h"
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index fbaf70af3d61..5275ad886971 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -18,19 +18,21 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_log.h" 21#include "xfs_log_format.h"
22#include "xfs_trans.h" 22#include "xfs_trans_resv.h"
23#include "xfs_sb.h" 23#include "xfs_sb.h"
24#include "xfs_ag.h" 24#include "xfs_ag.h"
25#include "xfs_mount.h" 25#include "xfs_mount.h"
26#include "xfs_error.h" 26#include "xfs_error.h"
27#include "xfs_trans.h"
28#include "xfs_trans_priv.h"
29#include "xfs_log.h"
27#include "xfs_log_priv.h" 30#include "xfs_log_priv.h"
28#include "xfs_buf_item.h" 31#include "xfs_buf_item.h"
29#include "xfs_bmap_btree.h" 32#include "xfs_bmap_btree.h"
30#include "xfs_alloc_btree.h" 33#include "xfs_alloc_btree.h"
31#include "xfs_ialloc_btree.h" 34#include "xfs_ialloc_btree.h"
32#include "xfs_log_recover.h" 35#include "xfs_log_recover.h"
33#include "xfs_trans_priv.h"
34#include "xfs_dinode.h" 36#include "xfs_dinode.h"
35#include "xfs_inode.h" 37#include "xfs_inode.h"
36#include "xfs_trace.h" 38#include "xfs_trace.h"
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index 1c458487f000..e148719e0a5d 100644
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -18,8 +18,6 @@
18#ifndef __XFS_LOG_H__ 18#ifndef __XFS_LOG_H__
19#define __XFS_LOG_H__ 19#define __XFS_LOG_H__
20 20
21#include "xfs_log_format.h"
22
23struct xfs_log_vec { 21struct xfs_log_vec {
24 struct xfs_log_vec *lv_next; /* next lv in build list */ 22 struct xfs_log_vec *lv_next; /* next lv in build list */
25 int lv_niovecs; /* number of iovecs in lv */ 23 int lv_niovecs; /* number of iovecs in lv */
@@ -82,11 +80,7 @@ struct xlog_ticket;
82struct xfs_log_item; 80struct xfs_log_item;
83struct xfs_item_ops; 81struct xfs_item_ops;
84struct xfs_trans; 82struct xfs_trans;
85 83struct xfs_log_callback;
86void xfs_log_item_init(struct xfs_mount *mp,
87 struct xfs_log_item *item,
88 int type,
89 const struct xfs_item_ops *ops);
90 84
91xfs_lsn_t xfs_log_done(struct xfs_mount *mp, 85xfs_lsn_t xfs_log_done(struct xfs_mount *mp,
92 struct xlog_ticket *ticket, 86 struct xlog_ticket *ticket,
@@ -114,7 +108,7 @@ xfs_lsn_t xlog_assign_tail_lsn_locked(struct xfs_mount *mp);
114void xfs_log_space_wake(struct xfs_mount *mp); 108void xfs_log_space_wake(struct xfs_mount *mp);
115int xfs_log_notify(struct xfs_mount *mp, 109int xfs_log_notify(struct xfs_mount *mp,
116 struct xlog_in_core *iclog, 110 struct xlog_in_core *iclog,
117 xfs_log_callback_t *callback_entry); 111 struct xfs_log_callback *callback_entry);
118int xfs_log_release_iclog(struct xfs_mount *mp, 112int xfs_log_release_iclog(struct xfs_mount *mp,
119 struct xlog_in_core *iclog); 113 struct xlog_in_core *iclog);
120int xfs_log_reserve(struct xfs_mount *mp, 114int xfs_log_reserve(struct xfs_mount *mp,
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index a844f77d2cc3..5eb51fc5eb84 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -17,11 +17,9 @@
17 17
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_log_format.h"
20#include "xfs_shared.h" 21#include "xfs_shared.h"
21#include "xfs_log.h" 22#include "xfs_trans_resv.h"
22#include "xfs_trans.h"
23#include "xfs_trans_priv.h"
24#include "xfs_log_priv.h"
25#include "xfs_sb.h" 23#include "xfs_sb.h"
26#include "xfs_ag.h" 24#include "xfs_ag.h"
27#include "xfs_mount.h" 25#include "xfs_mount.h"
@@ -29,6 +27,10 @@
29#include "xfs_alloc.h" 27#include "xfs_alloc.h"
30#include "xfs_extent_busy.h" 28#include "xfs_extent_busy.h"
31#include "xfs_discard.h" 29#include "xfs_discard.h"
30#include "xfs_trans.h"
31#include "xfs_trans_priv.h"
32#include "xfs_log.h"
33#include "xfs_log_priv.h"
32 34
33/* 35/*
34 * Allocate a new ticket. Failing to get a new ticket makes it really hard to 36 * Allocate a new ticket. Failing to get a new ticket makes it really hard to
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index f80cff26fda9..9bc403a9e54f 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -22,6 +22,7 @@ struct xfs_buf;
22struct xlog; 22struct xlog;
23struct xlog_ticket; 23struct xlog_ticket;
24struct xfs_mount; 24struct xfs_mount;
25struct xfs_log_callback;
25 26
26/* 27/*
27 * Flags for log structure 28 * Flags for log structure
@@ -227,8 +228,8 @@ typedef struct xlog_in_core {
227 228
228 /* Callback structures need their own cacheline */ 229 /* Callback structures need their own cacheline */
229 spinlock_t ic_callback_lock ____cacheline_aligned_in_smp; 230 spinlock_t ic_callback_lock ____cacheline_aligned_in_smp;
230 xfs_log_callback_t *ic_callback; 231 struct xfs_log_callback *ic_callback;
231 xfs_log_callback_t **ic_callback_tail; 232 struct xfs_log_callback **ic_callback_tail;
232 233
233 /* reference counts need their own cacheline */ 234 /* reference counts need their own cacheline */
234 atomic_t ic_refcnt ____cacheline_aligned_in_smp; 235 atomic_t ic_refcnt ____cacheline_aligned_in_smp;
@@ -254,7 +255,7 @@ struct xfs_cil_ctx {
254 int space_used; /* aggregate size of regions */ 255 int space_used; /* aggregate size of regions */
255 struct list_head busy_extents; /* busy extents in chkpt */ 256 struct list_head busy_extents; /* busy extents in chkpt */
256 struct xfs_log_vec *lv_chain; /* logvecs being pushed */ 257 struct xfs_log_vec *lv_chain; /* logvecs being pushed */
257 xfs_log_callback_t log_cb; /* completion callback hook. */ 258 struct xfs_log_callback log_cb; /* completion callback hook. */
258 struct list_head committing; /* ctx committing list */ 259 struct list_head committing; /* ctx committing list */
259}; 260};
260 261
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index cb3277e07844..832ba5d5eb3a 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -17,12 +17,12 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_format.h"
22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 24#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_inum.h" 25#include "xfs_inum.h"
25#include "xfs_trans.h"
26#include "xfs_sb.h" 26#include "xfs_sb.h"
27#include "xfs_ag.h" 27#include "xfs_ag.h"
28#include "xfs_mount.h" 28#include "xfs_mount.h"
@@ -34,11 +34,12 @@
34#include "xfs_btree.h" 34#include "xfs_btree.h"
35#include "xfs_dinode.h" 35#include "xfs_dinode.h"
36#include "xfs_inode.h" 36#include "xfs_inode.h"
37#include "xfs_trans.h"
37#include "xfs_inode_item.h" 38#include "xfs_inode_item.h"
38#include "xfs_alloc.h" 39#include "xfs_alloc.h"
39#include "xfs_ialloc.h" 40#include "xfs_ialloc.h"
41#include "xfs_log.h"
40#include "xfs_log_priv.h" 42#include "xfs_log_priv.h"
41#include "xfs_buf_item.h"
42#include "xfs_log_recover.h" 43#include "xfs_log_recover.h"
43#include "xfs_extfree_item.h" 44#include "xfs_extfree_item.h"
44#include "xfs_trans_priv.h" 45#include "xfs_trans_priv.h"
@@ -46,14 +47,10 @@
46#include "xfs_cksum.h" 47#include "xfs_cksum.h"
47#include "xfs_trace.h" 48#include "xfs_trace.h"
48#include "xfs_icache.h" 49#include "xfs_icache.h"
49#include "xfs_icreate_item.h"
50 50
51/* Need all the magic numbers and buffer ops structures from these headers */ 51/* Need all the magic numbers and buffer ops structures from these headers */
52#include "xfs_symlink.h"
53#include "xfs_da_btree.h" 52#include "xfs_da_btree.h"
54#include "xfs_dir2.h" 53#include "xfs_dir2.h"
55#include "xfs_attr_leaf.h"
56#include "xfs_attr_remote.h"
57 54
58#define BLK_AVG(blk1, blk2) ((blk1+blk2) >> 1) 55#define BLK_AVG(blk1, blk2) ((blk1+blk2) >> 1)
59 56
diff --git a/fs/xfs/xfs_log_rlimit.c b/fs/xfs/xfs_log_rlimit.c
index e598bb547dee..3749bc1c00a4 100644
--- a/fs/xfs/xfs_log_rlimit.c
+++ b/fs/xfs/xfs_log_rlimit.c
@@ -18,8 +18,8 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_log.h" 21#include "xfs_log_format.h"
22#include "xfs_trans.h" 22#include "xfs_trans_resv.h"
23#include "xfs_ag.h" 23#include "xfs_ag.h"
24#include "xfs_sb.h" 24#include "xfs_sb.h"
25#include "xfs_mount.h" 25#include "xfs_mount.h"
diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c
index 9163dc140532..63ca2f0420b1 100644
--- a/fs/xfs/xfs_message.c
+++ b/fs/xfs/xfs_message.c
@@ -17,9 +17,8 @@
17 17
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_types.h" 20#include "xfs_log_format.h"
21#include "xfs_log.h" 21#include "xfs_trans_resv.h"
22#include "xfs_trans.h"
23#include "xfs_sb.h" 22#include "xfs_sb.h"
24#include "xfs_ag.h" 23#include "xfs_ag.h"
25#include "xfs_mount.h" 24#include "xfs_mount.h"
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 170e7294b7b0..83f7810c53cd 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -17,17 +17,19 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_format.h"
22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 24#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_inum.h" 25#include "xfs_inum.h"
25#include "xfs_trans.h"
26#include "xfs_trans_priv.h"
27#include "xfs_sb.h" 26#include "xfs_sb.h"
28#include "xfs_ag.h" 27#include "xfs_ag.h"
29#include "xfs_mount.h" 28#include "xfs_mount.h"
30#include "xfs_da_format.h" 29#include "xfs_da_format.h"
30#include "xfs_trans.h"
31#include "xfs_trans_priv.h"
32#include "xfs_log.h"
31#include "xfs_dir2.h" 33#include "xfs_dir2.h"
32#include "xfs_bmap_btree.h" 34#include "xfs_bmap_btree.h"
33#include "xfs_alloc_btree.h" 35#include "xfs_alloc_btree.h"
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 6dfb4e320498..e2f675644b4d 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -18,14 +18,12 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h" 20#include "xfs_format.h"
21#include "xfs_log_format.h"
21#include "xfs_shared.h" 22#include "xfs_shared.h"
23#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 24#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_sb.h" 25#include "xfs_sb.h"
26#include "xfs_ag.h" 26#include "xfs_ag.h"
27#include "xfs_alloc.h"
28#include "xfs_quota.h"
29#include "xfs_mount.h" 27#include "xfs_mount.h"
30#include "xfs_bmap_btree.h" 28#include "xfs_bmap_btree.h"
31#include "xfs_ialloc_btree.h" 29#include "xfs_ialloc_btree.h"
@@ -33,10 +31,13 @@
33#include "xfs_inode.h" 31#include "xfs_inode.h"
34#include "xfs_ialloc.h" 32#include "xfs_ialloc.h"
35#include "xfs_itable.h" 33#include "xfs_itable.h"
34#include "xfs_alloc.h"
36#include "xfs_rtalloc.h" 35#include "xfs_rtalloc.h"
36#include "xfs_quota.h"
37#include "xfs_error.h" 37#include "xfs_error.h"
38#include "xfs_bmap.h" 38#include "xfs_bmap.h"
39#include "xfs_attr.h" 39#include "xfs_attr.h"
40#include "xfs_trans.h"
40#include "xfs_buf_item.h" 41#include "xfs_buf_item.h"
41#include "xfs_trans_space.h" 42#include "xfs_trans_space.h"
42#include "xfs_qm.h" 43#include "xfs_qm.h"
diff --git a/fs/xfs/xfs_qm_bhv.c b/fs/xfs/xfs_qm_bhv.c
index 3af50ccdfac1..704628961159 100644
--- a/fs/xfs/xfs_qm_bhv.c
+++ b/fs/xfs/xfs_qm_bhv.c
@@ -18,8 +18,8 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h" 20#include "xfs_format.h"
21#include "xfs_log.h" 21#include "xfs_log_format.h"
22#include "xfs_trans.h" 22#include "xfs_trans_resv.h"
23#include "xfs_sb.h" 23#include "xfs_sb.h"
24#include "xfs_ag.h" 24#include "xfs_ag.h"
25#include "xfs_alloc.h" 25#include "xfs_alloc.h"
@@ -32,6 +32,7 @@
32#include "xfs_rtalloc.h" 32#include "xfs_rtalloc.h"
33#include "xfs_error.h" 33#include "xfs_error.h"
34#include "xfs_attr.h" 34#include "xfs_attr.h"
35#include "xfs_trans.h"
35#include "xfs_buf_item.h" 36#include "xfs_buf_item.h"
36#include "xfs_qm.h" 37#include "xfs_qm.h"
37 38
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 174390703eb6..ab2326aaaeda 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -20,11 +20,11 @@
20 20
21#include "xfs.h" 21#include "xfs.h"
22#include "xfs_fs.h" 22#include "xfs_fs.h"
23#include "xfs_format.h"
24#include "xfs_shared.h" 23#include "xfs_shared.h"
24#include "xfs_format.h"
25#include "xfs_log_format.h"
26#include "xfs_trans_resv.h"
25#include "xfs_bit.h" 27#include "xfs_bit.h"
26#include "xfs_log.h"
27#include "xfs_trans.h"
28#include "xfs_sb.h" 28#include "xfs_sb.h"
29#include "xfs_ag.h" 29#include "xfs_ag.h"
30#include "xfs_alloc.h" 30#include "xfs_alloc.h"
@@ -32,6 +32,7 @@
32#include "xfs_mount.h" 32#include "xfs_mount.h"
33#include "xfs_bmap_btree.h" 33#include "xfs_bmap_btree.h"
34#include "xfs_inode.h" 34#include "xfs_inode.h"
35#include "xfs_trans.h"
35#include "xfs_inode_item.h" 36#include "xfs_inode_item.h"
36#include "xfs_itable.h" 37#include "xfs_itable.h"
37#include "xfs_bmap.h" 38#include "xfs_bmap.h"
diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index 1326d81596c2..2dd467b0b475 100644
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -17,8 +17,8 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_format.h" 19#include "xfs_format.h"
20#include "xfs_log_format.h"
20#include "xfs_trans_resv.h" 21#include "xfs_trans_resv.h"
21#include "xfs_log.h"
22#include "xfs_sb.h" 22#include "xfs_sb.h"
23#include "xfs_ag.h" 23#include "xfs_ag.h"
24#include "xfs_mount.h" 24#include "xfs_mount.h"
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 6f63de303e8e..23c5ca24a02d 100644
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -17,11 +17,11 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_format.h"
22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
22#include "xfs_bit.h" 24#include "xfs_bit.h"
23#include "xfs_log.h"
24#include "xfs_trans.h"
25#include "xfs_sb.h" 25#include "xfs_sb.h"
26#include "xfs_ag.h" 26#include "xfs_ag.h"
27#include "xfs_mount.h" 27#include "xfs_mount.h"
@@ -34,6 +34,7 @@
34#include "xfs_rtalloc.h" 34#include "xfs_rtalloc.h"
35#include "xfs_fsops.h" 35#include "xfs_fsops.h"
36#include "xfs_error.h" 36#include "xfs_error.h"
37#include "xfs_trans.h"
37#include "xfs_inode_item.h" 38#include "xfs_inode_item.h"
38#include "xfs_trans_space.h" 39#include "xfs_trans_space.h"
39#include "xfs_trace.h" 40#include "xfs_trace.h"
diff --git a/fs/xfs/xfs_sb.c b/fs/xfs/xfs_sb.c
index 73b24e15cef7..1b0a6420f1b8 100644
--- a/fs/xfs/xfs_sb.c
+++ b/fs/xfs/xfs_sb.c
@@ -18,11 +18,10 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h" 20#include "xfs_format.h"
21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h"
21#include "xfs_bit.h" 23#include "xfs_bit.h"
22#include "xfs_log.h"
23#include "xfs_inum.h" 24#include "xfs_inum.h"
24#include "xfs_trans.h"
25#include "xfs_trans_priv.h"
26#include "xfs_sb.h" 25#include "xfs_sb.h"
27#include "xfs_ag.h" 26#include "xfs_ag.h"
28#include "xfs_mount.h" 27#include "xfs_mount.h"
@@ -44,6 +43,8 @@
44#include "xfs_fsops.h" 43#include "xfs_fsops.h"
45#include "xfs_trace.h" 44#include "xfs_trace.h"
46#include "xfs_cksum.h" 45#include "xfs_cksum.h"
46#include "xfs_trans.h"
47#include "xfs_trans_priv.h"
47#include "xfs_buf_item.h" 48#include "xfs_buf_item.h"
48 49
49/* 50/*
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index a28eca47aa4c..4e20b420ff72 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -17,11 +17,11 @@
17 */ 17 */
18 18
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 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#include "xfs_inum.h" 24#include "xfs_inum.h"
24#include "xfs_trans.h"
25#include "xfs_sb.h" 25#include "xfs_sb.h"
26#include "xfs_ag.h" 26#include "xfs_ag.h"
27#include "xfs_alloc.h" 27#include "xfs_alloc.h"
@@ -41,7 +41,9 @@
41#include "xfs_itable.h" 41#include "xfs_itable.h"
42#include "xfs_fsops.h" 42#include "xfs_fsops.h"
43#include "xfs_attr.h" 43#include "xfs_attr.h"
44#include "xfs_trans.h"
44#include "xfs_buf_item.h" 45#include "xfs_buf_item.h"
46#include "xfs_log.h"
45#include "xfs_log_priv.h" 47#include "xfs_log_priv.h"
46#include "xfs_trans_priv.h" 48#include "xfs_trans_priv.h"
47#include "xfs_filestream.h" 49#include "xfs_filestream.h"
diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
index db32c504372c..93fc72c96fad 100644
--- a/fs/xfs/xfs_symlink.c
+++ b/fs/xfs/xfs_symlink.c
@@ -17,12 +17,12 @@
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_shared.h"
20#include "xfs_fs.h" 21#include "xfs_fs.h"
21#include "xfs_format.h" 22#include "xfs_format.h"
22#include "xfs_shared.h" 23#include "xfs_log_format.h"
24#include "xfs_trans_resv.h"
23#include "xfs_bit.h" 25#include "xfs_bit.h"
24#include "xfs_log.h"
25#include "xfs_trans.h"
26#include "xfs_sb.h" 26#include "xfs_sb.h"
27#include "xfs_ag.h" 27#include "xfs_ag.h"
28#include "xfs_mount.h" 28#include "xfs_mount.h"
@@ -41,7 +41,9 @@
41#include "xfs_trans_space.h" 41#include "xfs_trans_space.h"
42#include "xfs_trace.h" 42#include "xfs_trace.h"
43#include "xfs_symlink.h" 43#include "xfs_symlink.h"
44#include "xfs_trans.h"
44#include "xfs_buf_item.h" 45#include "xfs_buf_item.h"
46#include "xfs_log.h"
45 47
46/* ----- Kernel only functions below ----- */ 48/* ----- Kernel only functions below ----- */
47STATIC int 49STATIC int
diff --git a/fs/xfs/xfs_symlink_remote.c b/fs/xfs/xfs_symlink_remote.c
index 4251cd8e8fec..bf59a2b45f8c 100644
--- a/fs/xfs/xfs_symlink_remote.c
+++ b/fs/xfs/xfs_symlink_remote.c
@@ -19,9 +19,9 @@
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_format.h" 21#include "xfs_format.h"
22#include "xfs_log_format.h"
22#include "xfs_shared.h" 23#include "xfs_shared.h"
23#include "xfs_log.h" 24#include "xfs_trans_resv.h"
24#include "xfs_trans.h"
25#include "xfs_ag.h" 25#include "xfs_ag.h"
26#include "xfs_sb.h" 26#include "xfs_sb.h"
27#include "xfs_mount.h" 27#include "xfs_mount.h"
@@ -31,6 +31,7 @@
31#include "xfs_trace.h" 31#include "xfs_trace.h"
32#include "xfs_symlink.h" 32#include "xfs_symlink.h"
33#include "xfs_cksum.h" 33#include "xfs_cksum.h"
34#include "xfs_trans.h"
34#include "xfs_buf_item.h" 35#include "xfs_buf_item.h"
35 36
36 37
diff --git a/fs/xfs/xfs_trace.c b/fs/xfs/xfs_trace.c
index 6ca992020326..889bb4233323 100644
--- a/fs/xfs/xfs_trace.c
+++ b/fs/xfs/xfs_trace.c
@@ -17,10 +17,10 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
22#include "xfs_log.h" 21#include "xfs_format.h"
23#include "xfs_trans.h" 22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
24#include "xfs_sb.h" 24#include "xfs_sb.h"
25#include "xfs_ag.h" 25#include "xfs_ag.h"
26#include "xfs_mount.h" 26#include "xfs_mount.h"
@@ -38,6 +38,8 @@
38#include "xfs_bmap.h" 38#include "xfs_bmap.h"
39#include "xfs_attr.h" 39#include "xfs_attr.h"
40#include "xfs_attr_leaf.h" 40#include "xfs_attr_leaf.h"
41#include "xfs_trans.h"
42#include "xfs_log.h"
41#include "xfs_log_priv.h" 43#include "xfs_log_priv.h"
42#include "xfs_buf_item.h" 44#include "xfs_buf_item.h"
43#include "xfs_quota.h" 45#include "xfs_quota.h"
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 06000a9647d5..8d1595f9fd50 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -18,10 +18,10 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_format.h"
22#include "xfs_shared.h" 21#include "xfs_shared.h"
23#include "xfs_log.h" 22#include "xfs_format.h"
24#include "xfs_trans.h" 23#include "xfs_log_format.h"
24#include "xfs_trans_resv.h"
25#include "xfs_sb.h" 25#include "xfs_sb.h"
26#include "xfs_ag.h" 26#include "xfs_ag.h"
27#include "xfs_mount.h" 27#include "xfs_mount.h"
@@ -38,10 +38,12 @@
38#include "xfs_extent_busy.h" 38#include "xfs_extent_busy.h"
39#include "xfs_bmap.h" 39#include "xfs_bmap.h"
40#include "xfs_quota.h" 40#include "xfs_quota.h"
41#include "xfs_qm.h" 41#include "xfs_trans.h"
42#include "xfs_trans_priv.h" 42#include "xfs_trans_priv.h"
43#include "xfs_trans_space.h" 43#include "xfs_trans_space.h"
44#include "xfs_qm.h"
44#include "xfs_inode_item.h" 45#include "xfs_inode_item.h"
46#include "xfs_log.h"
45#include "xfs_log_priv.h" 47#include "xfs_log_priv.h"
46#include "xfs_buf_item.h" 48#include "xfs_buf_item.h"
47#include "xfs_trace.h" 49#include "xfs_trace.h"
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index 71c835e9e810..9cc5fbed4f26 100644
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -18,10 +18,6 @@
18#ifndef __XFS_TRANS_H__ 18#ifndef __XFS_TRANS_H__
19#define __XFS_TRANS_H__ 19#define __XFS_TRANS_H__
20 20
21struct xfs_log_item;
22
23#include "xfs_trans_resv.h"
24
25/* kernel only transaction subsystem defines */ 21/* kernel only transaction subsystem defines */
26 22
27struct xfs_buf; 23struct xfs_buf;
@@ -77,6 +73,9 @@ struct xfs_item_ops {
77 void (*iop_committing)(xfs_log_item_t *, xfs_lsn_t); 73 void (*iop_committing)(xfs_log_item_t *, xfs_lsn_t);
78}; 74};
79 75
76void xfs_log_item_init(struct xfs_mount *mp, struct xfs_log_item *item,
77 int type, const struct xfs_item_ops *ops);
78
80/* 79/*
81 * Return values for the iop_push() routines. 80 * Return values for the iop_push() routines.
82 */ 81 */
@@ -85,6 +84,7 @@ struct xfs_item_ops {
85#define XFS_ITEM_LOCKED 2 84#define XFS_ITEM_LOCKED 2
86#define XFS_ITEM_FLUSHING 3 85#define XFS_ITEM_FLUSHING 3
87 86
87
88/* 88/*
89 * This is the structure maintained for every active transaction. 89 * This is the structure maintained for every active transaction.
90 */ 90 */
@@ -125,7 +125,6 @@ typedef struct xfs_trans {
125 int64_t t_rextents_delta;/* superblocks rextents chg */ 125 int64_t t_rextents_delta;/* superblocks rextents chg */
126 int64_t t_rextslog_delta;/* superblocks rextslog chg */ 126 int64_t t_rextslog_delta;/* superblocks rextslog chg */
127 struct list_head t_items; /* log item descriptors */ 127 struct list_head t_items; /* log item descriptors */
128 xfs_trans_header_t t_header; /* header for in-log trans */
129 struct list_head t_busy; /* list of busy extents */ 128 struct list_head t_busy; /* list of busy extents */
130 unsigned long t_pflags; /* saved process flags state */ 129 unsigned long t_pflags; /* saved process flags state */
131} xfs_trans_t; 130} xfs_trans_t;
@@ -230,6 +229,7 @@ void xfs_trans_log_efd_extent(xfs_trans_t *,
230 xfs_fsblock_t, 229 xfs_fsblock_t,
231 xfs_extlen_t); 230 xfs_extlen_t);
232int xfs_trans_commit(xfs_trans_t *, uint flags); 231int xfs_trans_commit(xfs_trans_t *, uint flags);
232int xfs_trans_roll(struct xfs_trans **, struct xfs_inode *);
233void xfs_trans_cancel(xfs_trans_t *, int); 233void xfs_trans_cancel(xfs_trans_t *, int);
234int xfs_trans_ail_init(struct xfs_mount *); 234int xfs_trans_ail_init(struct xfs_mount *);
235void xfs_trans_ail_destroy(struct xfs_mount *); 235void xfs_trans_ail_destroy(struct xfs_mount *);
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
index 21c6d7ddbc06..4b47cfebd25b 100644
--- a/fs/xfs/xfs_trans_ail.c
+++ b/fs/xfs/xfs_trans_ail.c
@@ -18,15 +18,16 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_types.h" 21#include "xfs_log_format.h"
22#include "xfs_log.h" 22#include "xfs_trans_resv.h"
23#include "xfs_trans.h"
24#include "xfs_sb.h" 23#include "xfs_sb.h"
25#include "xfs_ag.h" 24#include "xfs_ag.h"
26#include "xfs_mount.h" 25#include "xfs_mount.h"
26#include "xfs_trans.h"
27#include "xfs_trans_priv.h" 27#include "xfs_trans_priv.h"
28#include "xfs_trace.h" 28#include "xfs_trace.h"
29#include "xfs_error.h" 29#include "xfs_error.h"
30#include "xfs_log.h"
30 31
31#ifdef DEBUG 32#ifdef DEBUG
32/* 33/*
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
index 0167a65ec851..6b1b993257d6 100644
--- a/fs/xfs/xfs_trans_buf.c
+++ b/fs/xfs/xfs_trans_buf.c
@@ -18,8 +18,8 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_log.h" 21#include "xfs_log_format.h"
22#include "xfs_trans.h" 22#include "xfs_trans_resv.h"
23#include "xfs_sb.h" 23#include "xfs_sb.h"
24#include "xfs_ag.h" 24#include "xfs_ag.h"
25#include "xfs_mount.h" 25#include "xfs_mount.h"
@@ -28,6 +28,7 @@
28#include "xfs_ialloc_btree.h" 28#include "xfs_ialloc_btree.h"
29#include "xfs_dinode.h" 29#include "xfs_dinode.h"
30#include "xfs_inode.h" 30#include "xfs_inode.h"
31#include "xfs_trans.h"
31#include "xfs_buf_item.h" 32#include "xfs_buf_item.h"
32#include "xfs_trans_priv.h" 33#include "xfs_trans_priv.h"
33#include "xfs_error.h" 34#include "xfs_error.h"
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 4d630d2c2804..2025f6eea4aa 100644
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -17,10 +17,10 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_format.h"
21#include "xfs_shared.h" 20#include "xfs_shared.h"
22#include "xfs_log.h" 21#include "xfs_format.h"
23#include "xfs_trans.h" 22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h"
24#include "xfs_sb.h" 24#include "xfs_sb.h"
25#include "xfs_ag.h" 25#include "xfs_ag.h"
26#include "xfs_alloc.h" 26#include "xfs_alloc.h"
@@ -33,6 +33,7 @@
33#include "xfs_rtalloc.h" 33#include "xfs_rtalloc.h"
34#include "xfs_error.h" 34#include "xfs_error.h"
35#include "xfs_attr.h" 35#include "xfs_attr.h"
36#include "xfs_trans.h"
36#include "xfs_buf_item.h" 37#include "xfs_buf_item.h"
37#include "xfs_trans_priv.h" 38#include "xfs_trans_priv.h"
38#include "xfs_qm.h" 39#include "xfs_qm.h"
diff --git a/fs/xfs/xfs_trans_extfree.c b/fs/xfs/xfs_trans_extfree.c
index 3bfb98bec050..47978ba89dae 100644
--- a/fs/xfs/xfs_trans_extfree.c
+++ b/fs/xfs/xfs_trans_extfree.c
@@ -18,11 +18,12 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_log.h" 21#include "xfs_log_format.h"
22#include "xfs_trans.h" 22#include "xfs_trans_resv.h"
23#include "xfs_sb.h" 23#include "xfs_sb.h"
24#include "xfs_ag.h" 24#include "xfs_ag.h"
25#include "xfs_mount.h" 25#include "xfs_mount.h"
26#include "xfs_trans.h"
26#include "xfs_trans_priv.h" 27#include "xfs_trans_priv.h"
27#include "xfs_extfree_item.h" 28#include "xfs_extfree_item.h"
28 29
diff --git a/fs/xfs/xfs_trans_inode.c b/fs/xfs/xfs_trans_inode.c
index dcab52ec9cb6..b1a0efa6b32a 100644
--- a/fs/xfs/xfs_trans_inode.c
+++ b/fs/xfs/xfs_trans_inode.c
@@ -18,8 +18,8 @@
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_fs.h" 19#include "xfs_fs.h"
20#include "xfs_shared.h" 20#include "xfs_shared.h"
21#include "xfs_log.h" 21#include "xfs_log_format.h"
22#include "xfs_trans.h" 22#include "xfs_trans_resv.h"
23#include "xfs_sb.h" 23#include "xfs_sb.h"
24#include "xfs_ag.h" 24#include "xfs_ag.h"
25#include "xfs_mount.h" 25#include "xfs_mount.h"
@@ -29,6 +29,7 @@
29#include "xfs_dinode.h" 29#include "xfs_dinode.h"
30#include "xfs_inode.h" 30#include "xfs_inode.h"
31#include "xfs_btree.h" 31#include "xfs_btree.h"
32#include "xfs_trans.h"
32#include "xfs_trans_priv.h" 33#include "xfs_trans_priv.h"
33#include "xfs_inode_item.h" 34#include "xfs_inode_item.h"
34#include "xfs_trace.h" 35#include "xfs_trace.h"
diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h
index c52def0b441c..12e86af9d9b9 100644
--- a/fs/xfs/xfs_trans_priv.h
+++ b/fs/xfs/xfs_trans_priv.h
@@ -27,7 +27,6 @@ struct xfs_log_vec;
27 27
28 28
29void xfs_trans_init(struct xfs_mount *); 29void xfs_trans_init(struct xfs_mount *);
30int xfs_trans_roll(struct xfs_trans **, struct xfs_inode *);
31void xfs_trans_add_item(struct xfs_trans *, struct xfs_log_item *); 30void xfs_trans_add_item(struct xfs_trans *, struct xfs_log_item *);
32void xfs_trans_del_item(struct xfs_log_item *); 31void xfs_trans_del_item(struct xfs_log_item *);
33void xfs_trans_free_items(struct xfs_trans *tp, xfs_lsn_t commit_lsn, 32void xfs_trans_free_items(struct xfs_trans *tp, xfs_lsn_t commit_lsn,
diff --git a/fs/xfs/xfs_trans_resv.c b/fs/xfs/xfs_trans_resv.c
index cc8361255c8e..89de046331da 100644
--- a/fs/xfs/xfs_trans_resv.c
+++ b/fs/xfs/xfs_trans_resv.c
@@ -18,11 +18,10 @@
18 */ 18 */
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_fs.h" 20#include "xfs_fs.h"
21#include "xfs_format.h"
22#include "xfs_shared.h" 21#include "xfs_shared.h"
23#include "xfs_log.h" 22#include "xfs_format.h"
23#include "xfs_log_format.h"
24#include "xfs_trans_resv.h" 24#include "xfs_trans_resv.h"
25#include "xfs_trans.h"
26#include "xfs_sb.h" 25#include "xfs_sb.h"
27#include "xfs_ag.h" 26#include "xfs_ag.h"
28#include "xfs_mount.h" 27#include "xfs_mount.h"
@@ -41,6 +40,7 @@
41#include "xfs_bmap.h" 40#include "xfs_bmap.h"
42#include "xfs_bmap_util.h" 41#include "xfs_bmap_util.h"
43#include "xfs_quota.h" 42#include "xfs_quota.h"
43#include "xfs_trans.h"
44#include "xfs_qm.h" 44#include "xfs_qm.h"
45#include "xfs_trans_space.h" 45#include "xfs_trans_space.h"
46#include "xfs_trace.h" 46#include "xfs_trace.h"
diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c
index 08047502683d..23052992c7e2 100644
--- a/fs/xfs/xfs_xattr.c
+++ b/fs/xfs/xfs_xattr.c
@@ -18,8 +18,7 @@
18 18
19#include "xfs.h" 19#include "xfs.h"
20#include "xfs_log_format.h" 20#include "xfs_log_format.h"
21#include "xfs_log.h" 21#include "xfs_trans_resv.h"
22#include "xfs_trans.h"
23#include "xfs_sb.h" 22#include "xfs_sb.h"
24#include "xfs_ag.h" 23#include "xfs_ag.h"
25#include "xfs_mount.h" 24#include "xfs_mount.h"
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-26 09:28:37 -0500