Commit 239880ef authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

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: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBen Myers <bpm@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent d420e5c8

fs/xfs/xfs_alloc.c

+4 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_format.h"

#include "xfs_log_format.h"

#include "xfs_shared.h"

#include "xfs_trans_resv.h"

#include "xfs_bit.h"

#include "xfs_log.h"

#include "xfs_trans.h"

#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_mount.h"
@@ -36,7 +36,9 @@ 
#include "xfs_error.h"

#include "xfs_cksum.h"

#include "xfs_trace.h"

#include "xfs_trans.h"

#include "xfs_buf_item.h"

#include "xfs_log.h"



struct workqueue_struct *xfs_alloc_wq;

fs/xfs/xfs_alloc_btree.c

+3 −3
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
 */

#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_types.h"

#include "xfs_log.h"

#include "xfs_trans.h"

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_mount.h"
@@ -34,6 +33,7 @@ 
#include "xfs_error.h"

#include "xfs_trace.h"

#include "xfs_cksum.h"

#include "xfs_trans.h"





STATIC struct xfs_btree_cur *

fs/xfs/xfs_aops.c

+4 −3
Original line number Diff line number Diff line
@@ -16,16 +16,17 @@ 
 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#include "xfs.h"

#include "xfs_format.h"

#include "xfs_shared.h"

#include "xfs_format.h"

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_log.h"

#include "xfs_trans.h"

#include "xfs_mount.h"

#include "xfs_bmap_btree.h"

#include "xfs_dinode.h"

#include "xfs_inode.h"

#include "xfs_trans.h"

#include "xfs_inode_item.h"

#include "xfs_alloc.h"

#include "xfs_error.h"

fs/xfs/xfs_attr.c

+4 −4
Original line number Diff line number Diff line
@@ -17,12 +17,11 @@ 
 */

#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_format.h"

#include "xfs_shared.h"

#include "xfs_format.h"

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_bit.h"

#include "xfs_log.h"

#include "xfs_trans.h"

#include "xfs_trans_priv.h"

#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_mount.h"
@@ -33,6 +32,7 @@ 
#include "xfs_dinode.h"

#include "xfs_inode.h"

#include "xfs_alloc.h"

#include "xfs_trans.h"

#include "xfs_inode_item.h"

#include "xfs_bmap.h"

#include "xfs_bmap_util.h"

fs/xfs/xfs_attr_inactive.c

+4 −4
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 
 */

#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_format.h"

#include "xfs_shared.h"

#include "xfs_format.h"

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_bit.h"

#include "xfs_log.h"

#include "xfs_trans.h"

#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_mount.h"
@@ -36,6 +36,7 @@ 
#include "xfs_attr_remote.h"

#include "xfs_dinode.h"

#include "xfs_inode.h"

#include "xfs_trans.h"

#include "xfs_inode_item.h"

#include "xfs_bmap.h"

#include "xfs_attr.h"
@@ -43,7 +44,6 @@ 
#include "xfs_error.h"

#include "xfs_quota.h"

#include "xfs_trace.h"

#include "xfs_trans_priv.h"



/*

 * Look at all the extents for this logical region,

CRA Git | Maintained and supported by SUSTech CRA and CCSE