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

Commit 9356fe22 authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: make struct xfs_perag kernel only 



The struct xfs_perag has many kernel-only definitions in it,
requiring a __KERNEL__ guard so userspace can use it to. Move it to
xfs_mount.h so that it it kernel-only, and let userspace redefine
it's own version of the structure containing only what it needs.
This gets rid of another __KERNEL__ check in the XFS header files.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 4f3d71f6

fs/xfs/xfs_acl.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "xfs_attr.h"

#include "xfs_attr.h"

#include "xfs_bmap_btree.h"

#include "xfs_bmap_btree.h"

#include "xfs_inode.h"

#include "xfs_inode.h"

#include "xfs_ag.h"

#include "xfs_sb.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_mount.h"

#include "xfs_trace.h"

#include "xfs_trace.h"

fs/xfs/xfs_ag.h

+0 −53
Original line number Original line Diff line number Diff line
@@ -226,59 +226,6 @@ typedef struct xfs_agfl { 
	__be32		agfl_bno[];	/* actually XFS_AGFL_SIZE(mp) */

	__be32		agfl_bno[];	/* actually XFS_AGFL_SIZE(mp) */

} xfs_agfl_t;

} xfs_agfl_t;





/*

 * Per-ag incore structure, copies of information in agf and agi,

 * to improve the performance of allocation group selection.

 */

#define XFS_PAGB_NUM_SLOTS	128



typedef struct xfs_perag {

	struct xfs_mount *pag_mount;	/* owner filesystem */

	xfs_agnumber_t	pag_agno;	/* AG this structure belongs to */

	atomic_t	pag_ref;	/* perag reference count */

	char		pagf_init;	/* this agf's entry is initialized */

	char		pagi_init;	/* this agi's entry is initialized */

	char		pagf_metadata;	/* the agf is preferred to be metadata */

	char		pagi_inodeok;	/* The agi is ok for inodes */

	__uint8_t	pagf_levels[XFS_BTNUM_AGF];

					/* # of levels in bno & cnt btree */

	__uint32_t	pagf_flcount;	/* count of blocks in freelist */

	xfs_extlen_t	pagf_freeblks;	/* total free blocks */

	xfs_extlen_t	pagf_longest;	/* longest free space */

	__uint32_t	pagf_btreeblks;	/* # of blocks held in AGF btrees */

	xfs_agino_t	pagi_freecount;	/* number of free inodes */

	xfs_agino_t	pagi_count;	/* number of allocated inodes */



	/*

	 * Inode allocation search lookup optimisation.

	 * If the pagino matches, the search for new inodes

	 * doesn't need to search the near ones again straight away

	 */

	xfs_agino_t	pagl_pagino;

	xfs_agino_t	pagl_leftrec;

	xfs_agino_t	pagl_rightrec;

#ifdef __KERNEL__

	spinlock_t	pagb_lock;	/* lock for pagb_tree */

	struct rb_root	pagb_tree;	/* ordered tree of busy extents */



	atomic_t        pagf_fstrms;    /* # of filestreams active in this AG */



	spinlock_t	pag_ici_lock;	/* incore inode cache lock */

	struct radix_tree_root pag_ici_root;	/* incore inode cache root */

	int		pag_ici_reclaimable;	/* reclaimable inodes */

	struct mutex	pag_ici_reclaim_lock;	/* serialisation point */

	unsigned long	pag_ici_reclaim_cursor;	/* reclaim restart point */



	/* buffer cache index */

	spinlock_t	pag_buf_lock;	/* lock for pag_buf_tree */

	struct rb_root	pag_buf_tree;	/* ordered tree of active buffers */



	/* for rcu-safe freeing */

	struct rcu_head	rcu_head;

#endif

	int		pagb_count;	/* pagb slots in use */

} xfs_perag_t;



/*

/*

 * tags for inode radix tree

 * tags for inode radix tree

 */

 */

fs/xfs/xfs_mount.h

+52 −0
Original line number Original line Diff line number Diff line
@@ -320,6 +320,58 @@ typedef struct xfs_mod_sb { 
	int64_t		msb_delta;	/* Change to make to specified field */

	int64_t		msb_delta;	/* Change to make to specified field */

} xfs_mod_sb_t;

} xfs_mod_sb_t;





/*

 * Per-ag incore structure, copies of information in agf and agi, to improve the

 * performance of allocation group selection. This is defined for the kernel

 * only, and hence is defined here instead of in xfs_ag.h. You need the struct

 * xfs_mount to be defined to look up a xfs_perag anyway (via mp->m_perag_tree),

 * so this doesn't introduce any strange header file dependencies.

 */

typedef struct xfs_perag {

	struct xfs_mount *pag_mount;	/* owner filesystem */

	xfs_agnumber_t	pag_agno;	/* AG this structure belongs to */

	atomic_t	pag_ref;	/* perag reference count */

	char		pagf_init;	/* this agf's entry is initialized */

	char		pagi_init;	/* this agi's entry is initialized */

	char		pagf_metadata;	/* the agf is preferred to be metadata */

	char		pagi_inodeok;	/* The agi is ok for inodes */

	__uint8_t	pagf_levels[XFS_BTNUM_AGF];

					/* # of levels in bno & cnt btree */

	__uint32_t	pagf_flcount;	/* count of blocks in freelist */

	xfs_extlen_t	pagf_freeblks;	/* total free blocks */

	xfs_extlen_t	pagf_longest;	/* longest free space */

	__uint32_t	pagf_btreeblks;	/* # of blocks held in AGF btrees */

	xfs_agino_t	pagi_freecount;	/* number of free inodes */

	xfs_agino_t	pagi_count;	/* number of allocated inodes */



	/*

	 * Inode allocation search lookup optimisation.

	 * If the pagino matches, the search for new inodes

	 * doesn't need to search the near ones again straight away

	 */

	xfs_agino_t	pagl_pagino;

	xfs_agino_t	pagl_leftrec;

	xfs_agino_t	pagl_rightrec;

	spinlock_t	pagb_lock;	/* lock for pagb_tree */

	struct rb_root	pagb_tree;	/* ordered tree of busy extents */



	atomic_t        pagf_fstrms;    /* # of filestreams active in this AG */



	spinlock_t	pag_ici_lock;	/* incore inode cache lock */

	struct radix_tree_root pag_ici_root;	/* incore inode cache root */

	int		pag_ici_reclaimable;	/* reclaimable inodes */

	struct mutex	pag_ici_reclaim_lock;	/* serialisation point */

	unsigned long	pag_ici_reclaim_cursor;	/* reclaim restart point */



	/* buffer cache index */

	spinlock_t	pag_buf_lock;	/* lock for pag_buf_tree */

	struct rb_root	pag_buf_tree;	/* ordered tree of active buffers */



	/* for rcu-safe freeing */

	struct rcu_head	rcu_head;

	int		pagb_count;	/* pagb slots in use */

} xfs_perag_t;



extern int	xfs_log_sbcount(xfs_mount_t *);

extern int	xfs_log_sbcount(xfs_mount_t *);

extern __uint64_t xfs_default_resblks(xfs_mount_t *mp);

extern __uint64_t xfs_default_resblks(xfs_mount_t *mp);

extern int	xfs_mountfs(xfs_mount_t *mp);

extern int	xfs_mountfs(xfs_mount_t *mp);

fs/xfs/xfs_symlink_remote.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "xfs_format.h"

#include "xfs_format.h"

#include "xfs_log.h"

#include "xfs_log.h"

#include "xfs_trans.h"

#include "xfs_trans.h"

#include "xfs_ag.h"

#include "xfs_sb.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_mount.h"

#include "xfs_bmap_btree.h"

#include "xfs_bmap_btree.h"