public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Brian Foster <bfoster@redhat.com>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 16/49] xfs: reshuffle dir2 definitions around for userspace
Date: Fri, 26 Jul 2013 09:18:36 -0400	[thread overview]
Message-ID: <51F2772C.2010500@redhat.com> (raw)
In-Reply-To: <1374215120-7271-17-git-send-email-david@fromorbit.com>

On 07/19/2013 02:24 AM, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> Many of the definitions within xfs_dir2_priv.h are needed in
> userspace outside libxfs. Definitions within xfs_dir2_priv.h are
> wholly contained within libxfs, so we need to shuffle some of the
> definitions around to keep consistency across files shared between
> user and kernel space.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---

xfs_dir2_data_freefind(), xfs_dir2_sf_put_parent_ino(),
xfs_dir2_sfe_put_ino() all go non-static, and some header fixups
(compile tested):

Reviewed-by: Brian Foster <bfoster@redhat.com>

>  fs/xfs/xfs_bmap.c         |  3 ++-
>  fs/xfs/xfs_da_btree.c     |  2 +-
>  fs/xfs/xfs_dir2.c         |  2 +-
>  fs/xfs/xfs_dir2.h         | 51 +++++++++++++++++++++++++++++++++++++++++++++++
>  fs/xfs/xfs_dir2_block.c   |  2 +-
>  fs/xfs/xfs_dir2_data.c    |  6 ++----
>  fs/xfs/xfs_dir2_leaf.c    |  1 +
>  fs/xfs/xfs_dir2_node.c    |  1 +
>  fs/xfs/xfs_dir2_priv.h    | 31 ----------------------------
>  fs/xfs/xfs_dir2_readdir.c |  1 +
>  fs/xfs/xfs_dir2_sf.c      |  6 +++---
>  fs/xfs/xfs_export.c       |  4 +++-
>  fs/xfs/xfs_file.c         |  2 +-
>  fs/xfs/xfs_icreate_item.c | 12 -----------
>  fs/xfs/xfs_log_recover.c  |  2 +-
>  fs/xfs/xfs_mount.c        |  4 +++-
>  fs/xfs/xfs_rename.c       |  3 ++-
>  fs/xfs/xfs_rtalloc.c      |  1 -
>  fs/xfs/xfs_super.c        |  3 ++-
>  fs/xfs/xfs_symlink.c      |  3 ++-
>  fs/xfs/xfs_utils.c        |  4 +++-
>  fs/xfs/xfs_vnodeops.c     |  3 ++-
>  22 files changed, 83 insertions(+), 64 deletions(-)
> 
> diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
> index 0343b44..72a2eea 100644
> --- a/fs/xfs/xfs_bmap.c
> +++ b/fs/xfs/xfs_bmap.c
> @@ -24,9 +24,10 @@
>  #include "xfs_trans.h"
>  #include "xfs_sb.h"
>  #include "xfs_ag.h"
> -#include "xfs_dir2.h"
>  #include "xfs_mount.h"
>  #include "xfs_da_btree.h"
> +#include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_bmap_btree.h"
>  #include "xfs_alloc_btree.h"
>  #include "xfs_ialloc_btree.h"
> diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
> index 0b8b2a1..8bbd7ef 100644
> --- a/fs/xfs/xfs_da_btree.c
> +++ b/fs/xfs/xfs_da_btree.c
> @@ -27,8 +27,8 @@
>  #include "xfs_mount.h"
>  #include "xfs_da_btree.h"
>  #include "xfs_bmap_btree.h"
> -#include "xfs_dir2.h"
>  #include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_dir2_priv.h"
>  #include "xfs_dinode.h"
>  #include "xfs_inode.h"
> diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
> index 431be44..c3263a5 100644
> --- a/fs/xfs/xfs_dir2.c
> +++ b/fs/xfs/xfs_dir2.c
> @@ -31,8 +31,8 @@
>  #include "xfs_inode.h"
>  #include "xfs_inode_item.h"
>  #include "xfs_bmap.h"
> -#include "xfs_dir2.h"
>  #include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_dir2_priv.h"
>  #include "xfs_error.h"
>  #include "xfs_vnodeops.h"
> diff --git a/fs/xfs/xfs_dir2.h b/fs/xfs/xfs_dir2.h
> index e937d99..7ef6b0f 100644
> --- a/fs/xfs/xfs_dir2.h
> +++ b/fs/xfs/xfs_dir2.h
> @@ -23,6 +23,11 @@ struct xfs_da_args;
>  struct xfs_inode;
>  struct xfs_mount;
>  struct xfs_trans;
> +struct xfs_dir2_sf_hdr;
> +struct xfs_dir2_sf_entry;
> +struct xfs_dir2_data_hdr;
> +struct xfs_dir2_data_entry;
> +struct xfs_dir2_data_unused;
>  
>  extern struct xfs_name	xfs_name_dotdot;
>  
> @@ -57,4 +62,50 @@ extern int xfs_dir_canenter(struct xfs_trans *tp, struct xfs_inode *dp,
>   */
>  extern int xfs_dir2_sf_to_block(struct xfs_da_args *args);
>  
> +/*
> + * Direct call on directory open, before entering the readdir code.
> + */
> +extern int xfs_dir3_data_readahead(struct xfs_trans *tp, struct xfs_inode *dp,
> +		xfs_dablk_t bno, xfs_daddr_t mapped_bno);
> +
> +/*
> + * Interface routines used by userspace utilities
> + */
> +extern xfs_ino_t xfs_dir2_sf_get_parent_ino(struct xfs_dir2_sf_hdr *sfp);
> +extern void xfs_dir2_sf_put_parent_ino(struct xfs_dir2_sf_hdr *sfp,
> +		xfs_ino_t ino);
> +extern xfs_ino_t xfs_dir2_sfe_get_ino(struct xfs_dir2_sf_hdr *sfp,
> +		struct xfs_dir2_sf_entry *sfep);
> +extern void xfs_dir2_sfe_put_ino( struct xfs_dir2_sf_hdr *,
> +		struct xfs_dir2_sf_entry *sfep, xfs_ino_t ino);
> +
> +extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *r);
> +extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *r);
> +extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
> +				struct xfs_buf *bp);
> +
> +extern void xfs_dir2_data_freescan(struct xfs_mount *mp,
> +		struct xfs_dir2_data_hdr *hdr, int *loghead);
> +extern void xfs_dir2_data_log_entry(struct xfs_trans *tp, struct xfs_buf *bp,
> +		struct xfs_dir2_data_entry *dep);
> +extern void xfs_dir2_data_log_header(struct xfs_trans *tp,
> +		struct xfs_buf *bp);
> +extern void xfs_dir2_data_log_unused(struct xfs_trans *tp, struct xfs_buf *bp,
> +		struct xfs_dir2_data_unused *dup);
> +extern void xfs_dir2_data_make_free(struct xfs_trans *tp, struct xfs_buf *bp,
> +		xfs_dir2_data_aoff_t offset, xfs_dir2_data_aoff_t len,
> +		int *needlogp, int *needscanp);
> +extern void xfs_dir2_data_use_free(struct xfs_trans *tp, struct xfs_buf *bp,
> +		struct xfs_dir2_data_unused *dup, xfs_dir2_data_aoff_t offset,
> +		xfs_dir2_data_aoff_t len, int *needlogp, int *needscanp);
> +
> +extern struct xfs_dir2_data_free *xfs_dir2_data_freefind(
> +		struct xfs_dir2_data_hdr *hdr, struct xfs_dir2_data_unused *dup);
> +
> +extern const struct xfs_buf_ops xfs_dir3_block_buf_ops;
> +extern const struct xfs_buf_ops xfs_dir3_leafn_buf_ops;
> +extern const struct xfs_buf_ops xfs_dir3_leaf1_buf_ops;
> +extern const struct xfs_buf_ops xfs_dir3_free_buf_ops;
> +extern const struct xfs_buf_ops xfs_dir3_data_buf_ops;
> +
>  #endif	/* __XFS_DIR2_H__ */
> diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
> index 5e84000..becd69f 100644
> --- a/fs/xfs/xfs_dir2_block.c
> +++ b/fs/xfs/xfs_dir2_block.c
> @@ -31,8 +31,8 @@
>  #include "xfs_inode_item.h"
>  #include "xfs_bmap.h"
>  #include "xfs_buf_item.h"
> -#include "xfs_dir2.h"
>  #include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_dir2_priv.h"
>  #include "xfs_error.h"
>  #include "xfs_trace.h"
> diff --git a/fs/xfs/xfs_dir2_data.c b/fs/xfs/xfs_dir2_data.c
> index c293023..4e1917d 100644
> --- a/fs/xfs/xfs_dir2_data.c
> +++ b/fs/xfs/xfs_dir2_data.c
> @@ -29,14 +29,12 @@
>  #include "xfs_dinode.h"
>  #include "xfs_inode.h"
>  #include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_dir2_priv.h"
>  #include "xfs_error.h"
>  #include "xfs_buf_item.h"
>  #include "xfs_cksum.h"
>  
> -STATIC xfs_dir2_data_free_t *
> -xfs_dir2_data_freefind(xfs_dir2_data_hdr_t *hdr, xfs_dir2_data_unused_t *dup);
> -
>  /*
>   * Check the consistency of the data block.
>   * The input can also be a block-format directory.
> @@ -325,7 +323,7 @@ xfs_dir3_data_readahead(
>   * Given a data block and an unused entry from that block,
>   * return the bestfree entry if any that corresponds to it.
>   */
> -STATIC xfs_dir2_data_free_t *
> +xfs_dir2_data_free_t *
>  xfs_dir2_data_freefind(
>  	xfs_dir2_data_hdr_t	*hdr,		/* data block */
>  	xfs_dir2_data_unused_t	*dup)		/* data unused entry */
> diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c
> index e1386aa..5505edb 100644
> --- a/fs/xfs/xfs_dir2_leaf.c
> +++ b/fs/xfs/xfs_dir2_leaf.c
> @@ -31,6 +31,7 @@
>  #include "xfs_inode.h"
>  #include "xfs_bmap.h"
>  #include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_dir2_priv.h"
>  #include "xfs_error.h"
>  #include "xfs_trace.h"
> diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
> index 2226a00..b4bd9b6 100644
> --- a/fs/xfs/xfs_dir2_node.c
> +++ b/fs/xfs/xfs_dir2_node.c
> @@ -30,6 +30,7 @@
>  #include "xfs_inode.h"
>  #include "xfs_bmap.h"
>  #include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_dir2_priv.h"
>  #include "xfs_error.h"
>  #include "xfs_trace.h"
> diff --git a/fs/xfs/xfs_dir2_priv.h b/fs/xfs/xfs_dir2_priv.h
> index 72ff8d7..807eb65 100644
> --- a/fs/xfs/xfs_dir2_priv.h
> +++ b/fs/xfs/xfs_dir2_priv.h
> @@ -20,18 +20,12 @@
>  
>  /* xfs_dir2.c */
>  extern int xfs_dir_ino_validate(struct xfs_mount *mp, xfs_ino_t ino);
> -extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *r);
> -extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *r);
>  extern int xfs_dir2_grow_inode(struct xfs_da_args *args, int space,
>  				xfs_dir2_db_t *dbp);
> -extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
> -				struct xfs_buf *bp);
>  extern int xfs_dir_cilookup_result(struct xfs_da_args *args,
>  				const unsigned char *name, int len);
>  
>  /* xfs_dir2_block.c */
> -extern const struct xfs_buf_ops xfs_dir3_block_buf_ops;
> -
>  extern int xfs_dir3_block_read(struct xfs_trans *tp, struct xfs_inode *dp,
>  			       struct xfs_buf **bpp);
>  extern int xfs_dir2_block_addname(struct xfs_da_args *args);
> @@ -48,39 +42,17 @@ extern int xfs_dir2_leaf_to_block(struct xfs_da_args *args,
>  #define	xfs_dir3_data_check(dp,bp)
>  #endif
>  
> -extern const struct xfs_buf_ops xfs_dir3_data_buf_ops;
> -extern const struct xfs_buf_ops xfs_dir3_free_buf_ops;
> -
>  extern int __xfs_dir3_data_check(struct xfs_inode *dp, struct xfs_buf *bp);
>  extern int xfs_dir3_data_read(struct xfs_trans *tp, struct xfs_inode *dp,
>  		xfs_dablk_t bno, xfs_daddr_t mapped_bno, struct xfs_buf **bpp);
> -extern int xfs_dir3_data_readahead(struct xfs_trans *tp, struct xfs_inode *dp,
> -		xfs_dablk_t bno, xfs_daddr_t mapped_bno);
>  
>  extern struct xfs_dir2_data_free *
>  xfs_dir2_data_freeinsert(struct xfs_dir2_data_hdr *hdr,
>  		struct xfs_dir2_data_unused *dup, int *loghead);
> -extern void xfs_dir2_data_freescan(struct xfs_mount *mp,
> -		struct xfs_dir2_data_hdr *hdr, int *loghead);
>  extern int xfs_dir3_data_init(struct xfs_da_args *args, xfs_dir2_db_t blkno,
>  		struct xfs_buf **bpp);
> -extern void xfs_dir2_data_log_entry(struct xfs_trans *tp, struct xfs_buf *bp,
> -		struct xfs_dir2_data_entry *dep);
> -extern void xfs_dir2_data_log_header(struct xfs_trans *tp,
> -		struct xfs_buf *bp);
> -extern void xfs_dir2_data_log_unused(struct xfs_trans *tp, struct xfs_buf *bp,
> -		struct xfs_dir2_data_unused *dup);
> -extern void xfs_dir2_data_make_free(struct xfs_trans *tp, struct xfs_buf *bp,
> -		xfs_dir2_data_aoff_t offset, xfs_dir2_data_aoff_t len,
> -		int *needlogp, int *needscanp);
> -extern void xfs_dir2_data_use_free(struct xfs_trans *tp, struct xfs_buf *bp,
> -		struct xfs_dir2_data_unused *dup, xfs_dir2_data_aoff_t offset,
> -		xfs_dir2_data_aoff_t len, int *needlogp, int *needscanp);
>  
>  /* xfs_dir2_leaf.c */
> -extern const struct xfs_buf_ops xfs_dir3_leaf1_buf_ops;
> -extern const struct xfs_buf_ops xfs_dir3_leafn_buf_ops;
> -
>  extern int xfs_dir3_leafn_read(struct xfs_trans *tp, struct xfs_inode *dp,
>  		xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp);
>  extern int xfs_dir2_block_to_leaf(struct xfs_da_args *args,
> @@ -142,9 +114,6 @@ extern int xfs_dir2_free_read(struct xfs_trans *tp, struct xfs_inode *dp,
>  		xfs_dablk_t fbno, struct xfs_buf **bpp);
>  
>  /* xfs_dir2_sf.c */
> -extern xfs_ino_t xfs_dir2_sf_get_parent_ino(struct xfs_dir2_sf_hdr *sfp);
> -extern xfs_ino_t xfs_dir2_sfe_get_ino(struct xfs_dir2_sf_hdr *sfp,
> -		struct xfs_dir2_sf_entry *sfep);
>  extern int xfs_dir2_block_sfsize(struct xfs_inode *dp,
>  		struct xfs_dir2_data_hdr *block, struct xfs_dir2_sf_hdr *sfhp);
>  extern int xfs_dir2_block_to_sf(struct xfs_da_args *args, struct xfs_buf *bp,
> diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
> index fd3829a..e6211a7 100644
> --- a/fs/xfs/xfs_dir2_readdir.c
> +++ b/fs/xfs/xfs_dir2_readdir.c
> @@ -30,6 +30,7 @@
>  #include "xfs_dinode.h"
>  #include "xfs_inode.h"
>  #include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_dir2_priv.h"
>  #include "xfs_error.h"
>  #include "xfs_trace.h"
> diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
> index f24ce90..65b65c5 100644
> --- a/fs/xfs/xfs_dir2_sf.c
> +++ b/fs/xfs/xfs_dir2_sf.c
> @@ -29,8 +29,8 @@
>  #include "xfs_inode.h"
>  #include "xfs_inode_item.h"
>  #include "xfs_error.h"
> -#include "xfs_dir2.h"
>  #include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_dir2_priv.h"
>  #include "xfs_trace.h"
>  
> @@ -95,7 +95,7 @@ xfs_dir2_sf_get_parent_ino(
>  	return xfs_dir2_sf_get_ino(hdr, &hdr->parent);
>  }
>  
> -static void
> +void
>  xfs_dir2_sf_put_parent_ino(
>  	struct xfs_dir2_sf_hdr	*hdr,
>  	xfs_ino_t		ino)
> @@ -123,7 +123,7 @@ xfs_dir2_sfe_get_ino(
>  	return xfs_dir2_sf_get_ino(hdr, xfs_dir2_sfe_inop(sfep));
>  }
>  
> -static void
> +void
>  xfs_dir2_sfe_put_ino(
>  	struct xfs_dir2_sf_hdr	*hdr,
>  	struct xfs_dir2_sf_entry *sfep,
> diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c
> index c585bc6..29c880f 100644
> --- a/fs/xfs/xfs_export.c
> +++ b/fs/xfs/xfs_export.c
> @@ -21,8 +21,10 @@
>  #include "xfs_trans.h"
>  #include "xfs_sb.h"
>  #include "xfs_ag.h"
> -#include "xfs_dir2.h"
>  #include "xfs_mount.h"
> +#include "xfs_da_btree.h"
> +#include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_export.h"
>  #include "xfs_vnodeops.h"
>  #include "xfs_bmap_btree.h"
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index de3dc98..1ba3c79 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -32,7 +32,7 @@
>  #include "xfs_vnodeops.h"
>  #include "xfs_da_btree.h"
>  #include "xfs_dir2_format.h"
> -#include "xfs_dir2_priv.h"
> +#include "xfs_dir2.h"
>  #include "xfs_ioctl.h"
>  #include "xfs_trace.h"
>  
> diff --git a/fs/xfs/xfs_icreate_item.c b/fs/xfs/xfs_icreate_item.c
> index 7716a4e..441a78a 100644
> --- a/fs/xfs/xfs_icreate_item.c
> +++ b/fs/xfs/xfs_icreate_item.c
> @@ -20,23 +20,11 @@
>  #include "xfs_types.h"
>  #include "xfs_bit.h"
>  #include "xfs_log.h"
> -#include "xfs_inum.h"
>  #include "xfs_trans.h"
> -#include "xfs_buf_item.h"
>  #include "xfs_sb.h"
>  #include "xfs_ag.h"
> -#include "xfs_dir2.h"
>  #include "xfs_mount.h"
>  #include "xfs_trans_priv.h"
> -#include "xfs_bmap_btree.h"
> -#include "xfs_alloc_btree.h"
> -#include "xfs_ialloc_btree.h"
> -#include "xfs_attr_sf.h"
> -#include "xfs_dinode.h"
> -#include "xfs_inode.h"
> -#include "xfs_inode_item.h"
> -#include "xfs_btree.h"
> -#include "xfs_ialloc.h"
>  #include "xfs_error.h"
>  #include "xfs_icreate_item.h"
>  
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 8763452..fabcc84 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -51,7 +51,7 @@
>  #include "xfs_symlink.h"
>  #include "xfs_da_btree.h"
>  #include "xfs_dir2_format.h"
> -#include "xfs_dir2_priv.h"
> +#include "xfs_dir2.h"
>  #include "xfs_attr_leaf.h"
>  #include "xfs_attr_remote.h"
>  
> diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
> index 2231498..5c7272f 100644
> --- a/fs/xfs/xfs_mount.c
> +++ b/fs/xfs/xfs_mount.c
> @@ -25,8 +25,10 @@
>  #include "xfs_trans_priv.h"
>  #include "xfs_sb.h"
>  #include "xfs_ag.h"
> -#include "xfs_dir2.h"
>  #include "xfs_mount.h"
> +#include "xfs_da_btree.h"
> +#include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_bmap_btree.h"
>  #include "xfs_alloc_btree.h"
>  #include "xfs_ialloc_btree.h"
> diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c
> index 0c1f8ef..4715c7f 100644
> --- a/fs/xfs/xfs_rename.c
> +++ b/fs/xfs/xfs_rename.c
> @@ -22,9 +22,10 @@
>  #include "xfs_trans.h"
>  #include "xfs_sb.h"
>  #include "xfs_ag.h"
> -#include "xfs_dir2.h"
>  #include "xfs_mount.h"
>  #include "xfs_da_btree.h"
> +#include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_bmap_btree.h"
>  #include "xfs_dinode.h"
>  #include "xfs_inode.h"
> diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
> index 5d900ec..bb4f7a1 100644
> --- a/fs/xfs/xfs_rtalloc.c
> +++ b/fs/xfs/xfs_rtalloc.c
> @@ -23,7 +23,6 @@
>  #include "xfs_trans.h"
>  #include "xfs_sb.h"
>  #include "xfs_ag.h"
> -#include "xfs_dir2.h"
>  #include "xfs_mount.h"
>  #include "xfs_bmap_btree.h"
>  #include "xfs_dinode.h"
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 146e2c2..7d57560 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -23,7 +23,6 @@
>  #include "xfs_trans.h"
>  #include "xfs_sb.h"
>  #include "xfs_ag.h"
> -#include "xfs_dir2.h"
>  #include "xfs_alloc.h"
>  #include "xfs_quota.h"
>  #include "xfs_mount.h"
> @@ -47,6 +46,8 @@
>  #include "xfs_trans_priv.h"
>  #include "xfs_filestream.h"
>  #include "xfs_da_btree.h"
> +#include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_extfree_item.h"
>  #include "xfs_mru_cache.h"
>  #include "xfs_inode_item.h"
> diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
> index 80d550c..dd7c099 100644
> --- a/fs/xfs/xfs_symlink.c
> +++ b/fs/xfs/xfs_symlink.c
> @@ -24,9 +24,10 @@
>  #include "xfs_trans.h"
>  #include "xfs_sb.h"
>  #include "xfs_ag.h"
> -#include "xfs_dir2.h"
>  #include "xfs_mount.h"
>  #include "xfs_da_btree.h"
> +#include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_bmap_btree.h"
>  #include "xfs_ialloc_btree.h"
>  #include "xfs_dinode.h"
> diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c
> index 58386fa..fde7d22 100644
> --- a/fs/xfs/xfs_utils.c
> +++ b/fs/xfs/xfs_utils.c
> @@ -22,8 +22,10 @@
>  #include "xfs_trans.h"
>  #include "xfs_sb.h"
>  #include "xfs_ag.h"
> -#include "xfs_dir2.h"
>  #include "xfs_mount.h"
> +#include "xfs_da_btree.h"
> +#include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_bmap_btree.h"
>  #include "xfs_dinode.h"
>  #include "xfs_inode.h"
> diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
> index c2d96cd..221e2e3 100644
> --- a/fs/xfs/xfs_vnodeops.c
> +++ b/fs/xfs/xfs_vnodeops.c
> @@ -25,9 +25,10 @@
>  #include "xfs_trans.h"
>  #include "xfs_sb.h"
>  #include "xfs_ag.h"
> -#include "xfs_dir2.h"
>  #include "xfs_mount.h"
>  #include "xfs_da_btree.h"
> +#include "xfs_dir2_format.h"
> +#include "xfs_dir2.h"
>  #include "xfs_bmap_btree.h"
>  #include "xfs_ialloc_btree.h"
>  #include "xfs_dinode.h"
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  reply	other threads:[~2013-07-26 13:21 UTC|newest]

Thread overview: 158+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-19  6:24 [PATCH 00/49] current patch queue for 3.12 Dave Chinner
2013-07-19  6:24 ` [PATCH 01/49] xfs: separate out log format definitions Dave Chinner
2013-07-23 14:00   ` Brian Foster
2013-07-19  6:24 ` [PATCH 02/49] xfs: split out inode log item format definition Dave Chinner
2013-07-23 14:00   ` Brian Foster
2013-07-30 16:20   ` Mark Tinguely
2013-08-01  8:50     ` Christoph Hellwig
2013-07-19  6:24 ` [PATCH 03/49] xfs: split out buf log item format definitions Dave Chinner
2013-07-23 14:01   ` Brian Foster
2013-07-19  6:24 ` [PATCH 04/49] xfs: split out inode log item format definition Dave Chinner
2013-07-23 14:01   ` Brian Foster
2013-07-19  6:24 ` [PATCH 05/49] xfs: separate dquot on disk format definitions out of xfs_quota.h Dave Chinner
2013-07-24 12:09   ` Brian Foster
2013-08-01  8:51   ` Christoph Hellwig
2013-08-02  1:44     ` Dave Chinner
2013-07-19  6:24 ` [PATCH 06/49] xfs: separate icreate log format definitions from xfs_icreate_item.h Dave Chinner
2013-07-24 12:09   ` Brian Foster
2013-07-19  6:24 ` [PATCH 07/49] xfs: split out on-disk transaction definitions Dave Chinner
2013-07-24 12:09   ` Brian Foster
2013-07-19  6:24 ` [PATCH 08/49] xfs: introduce xfs_rtalloc_defs.h Dave Chinner
2013-07-24 12:09   ` Brian Foster
2013-07-19  6:24 ` [PATCH 09/49] xfs: introduce xfs_quota_defs.h Dave Chinner
2013-07-25 12:54   ` Brian Foster
2013-07-19  6:24 ` [PATCH 10/49] xfs: sync minor header differences needed by userspace Dave Chinner
2013-07-25 12:54   ` Brian Foster
2013-07-19  6:24 ` [PATCH 11/49] xfs: split out transaction reservation code Dave Chinner
2013-07-25 12:55   ` Brian Foster
2013-07-19  6:24 ` [PATCH 12/49] xfs: move inode fork definitions to a new header file Dave Chinner
2013-07-25 20:40   ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 13/49] xfs: move unrealted definitions out of xfs_inode.h Dave Chinner
2013-07-25 19:24   ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 14/49] xfs: introduce xfs_inode_buf.c for inode buffer operations Dave Chinner
2013-07-25 19:17   ` Mark Tinguely
2013-07-26  0:24     ` Dave Chinner
2013-07-26 12:41   ` Brian Foster
2013-07-19  6:24 ` [PATCH 15/49] xfs: move getdents code into it's own file Dave Chinner
2013-07-26 13:00   ` Brian Foster
2013-07-19  6:24 ` [PATCH 16/49] xfs: reshuffle dir2 definitions around for userspace Dave Chinner
2013-07-26 13:18   ` Brian Foster [this message]
2013-07-19  6:24 ` [PATCH 17/49] xfs: split out attribute listing code into separate file Dave Chinner
2013-07-27 20:23   ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 18/49] xfs: split out attribute fork truncation " Dave Chinner
2013-07-27 19:25   ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 19/49] xfs: split out the remote symlink handling Dave Chinner
2013-07-27 19:48   ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 20/49] xfs: introduce xfs_sb.c for sharing with libxfs Dave Chinner
2013-07-27 17:54   ` Mark Tinguely
2013-07-28  1:08     ` Dave Chinner
2013-07-19  6:24 ` [PATCH 21/49] xfs: create xfs_bmap_util.[ch] Dave Chinner
2013-07-27 17:57   ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 22/49] xfs: minor cleanups Dave Chinner
2013-07-27 18:00   ` Mark Tinguely
2013-07-28  1:07     ` Dave Chinner
2013-07-19  6:24 ` [PATCH 23/49] xfs: fix issues that cause userspace warnings Dave Chinner
2013-07-27 18:02   ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 24/49] xfs: kill xfs_vnodeops.[ch] Dave Chinner
2013-07-26 19:18   ` Mark Tinguely
2013-07-27  1:55     ` Dave Chinner
2013-07-27 18:58       ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 25/49] xfs: consolidate xfs_rename.c Dave Chinner
2013-07-26 19:33   ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 26/49] xfs: consolidate xfs_utils.c Dave Chinner
2013-07-26 20:16   ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 27/49] xfs: consolidate extent swap code Dave Chinner
2013-07-26 21:16   ` Mark Tinguely
2013-07-19  6:24 ` [PATCH 28/49] xfs: don't special case shared superblock mounts Dave Chinner
2013-07-26 15:32   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 29/49] xfs: kill __KERNEL__ check for debug code in allocation code Dave Chinner
2013-07-26 15:07   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 30/49] xfs: remove __KERNEL__ from debug code Dave Chinner
2013-07-26 15:03   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 31/49] xfs: remove __KERNEL__ check from xfs_dir2_leaf.c Dave Chinner
2013-07-26 14:16   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 32/49] xfs: xfs_filestreams.h doesn't need __KERNEL__ Dave Chinner
2013-07-26 14:10   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 33/49] xfs: move kernel specific type definitions to xfs.h Dave Chinner
2013-07-26 13:51   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 34/49] xfs: make struct xfs_perag kernel only Dave Chinner
2013-07-26 13:32   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 35/49] xfs: Introduce a new structure to hold transaction reservation items Dave Chinner
2013-07-22 13:05   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 36/49] xfs: Introduce tr_fsyncts to m_reservation Dave Chinner
2013-07-22 13:22   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 37/49] xfs: Make writeid transaction use tr_writeid Dave Chinner
2013-07-22 13:23   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 38/49] xfs: refactor xfs_trans_reserve() interface Dave Chinner
2013-07-22 13:27   ` Mark Tinguely
2013-07-22 23:37     ` Dave Chinner
2013-07-19  6:25 ` [PATCH 39/49] xfs: Get rid of all XFS_XXX_LOG_RES() macro Dave Chinner
2013-07-22 13:31   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 40/49] xfs: Refactor xfs_ticket_alloc() to extract a new helper Dave Chinner
2013-07-22 13:49   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 41/49] xfs: Add xfs_log_rlimit.c Dave Chinner
2013-07-23 15:15   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 42/49] xfs: Validate log space at mount time Dave Chinner
2013-07-22 13:55   ` Mark Tinguely
2013-07-25  4:11   ` Dave Chinner
2013-07-19  6:25 ` [PATCH 43/49] xfs: return log item size in IOP_SIZE Dave Chinner
2013-07-23 18:22   ` Mark Tinguely
2013-08-01  8:18   ` Christoph Hellwig
2013-07-19  6:25 ` [PATCH 44/49] xfs: Reduce allocations during CIL insertion Dave Chinner
2013-07-23 21:15   ` Mark Tinguely
2013-07-23 21:44     ` Michael L. Semon
2013-07-24 13:28       ` Mark Tinguely
2013-07-24 19:20         ` Michael L. Semon
2013-07-25  0:21         ` Dave Chinner
2013-07-25 15:02           ` Mark Tinguely
2013-07-26  0:32             ` Dave Chinner
2013-07-26 20:46         ` Michael L. Semon
2013-07-26 21:06           ` Mark Tinguely
2013-07-26 22:19             ` Michael L. Semon
2013-07-27  1:58             ` Dave Chinner
2013-07-27 18:32               ` Mark Tinguely
2013-07-28  1:12                 ` Dave Chinner
2013-07-29 14:15                   ` Mark Tinguely
2013-07-30  0:30                     ` Dave Chinner
2013-07-30 13:31                       ` Mark Tinguely
2013-07-30 22:19                         ` Dave Chinner
2013-07-19  6:25 ` [PATCH 45/49] xfs: avoid CIL allocation during insert Dave Chinner
2013-07-29 18:13   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 46/49] xfs: Combine CIL insert and prepare passes Dave Chinner
2013-07-23 21:21   ` Mark Tinguely
2013-07-25  0:23     ` Dave Chinner
2013-07-29 21:07   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 47/49] xfs: split the CIL lock Dave Chinner
2013-07-29 22:24   ` Mark Tinguely
2013-07-19  6:25 ` [PATCH 48/49] xfs: Add read-only support for dirent filetype field Dave Chinner
2013-07-30 19:10   ` Mark Tinguely
2013-08-12  0:59     ` ***** SUSPECTED SPAM ***** " Dave Chinner
2013-08-12 13:25       ` Mark Tinguely
2013-08-13  0:50         ` Dave Chinner
2013-08-13 15:42           ` Mark Tinguely
2013-08-13 15:57             ` Christoph Hellwig
2013-08-14  7:50             ` Dave Chinner
2013-08-14 18:47               ` Geoffrey Wehrman
2013-08-15  4:22                 ` Dave Chinner
2013-08-15 17:39                   ` Geoffrey Wehrman
2013-08-15  5:59                 ` Ric Wheeler
2013-08-15 18:04                   ` Geoffrey Wehrman
2013-08-15 21:41                     ` Ric Wheeler
2013-08-16 14:08                       ` Geoffrey Wehrman
2013-08-19  5:28                         ` Dave Chinner
2013-08-19 18:48                           ` Geoffrey Wehrman
2013-08-20  2:23                             ` Dave Chinner
2013-08-20 14:30                               ` Geoffrey Wehrman
2013-08-20 18:27                                 ` Ric Wheeler
2013-08-20 19:47                         ` Eric Sandeen
2013-08-15 16:50                 ` Eric Sandeen
2013-08-15 18:32                   ` Geoffrey Wehrman
2013-08-15 18:41                     ` Eric Sandeen
2013-08-15 19:06                       ` Geoffrey Wehrman
2013-08-15 18:54                   ` Ben Myers
2013-08-15 22:40   ` Ben Myers
2013-07-19  6:25 ` [PATCH 49/49] xfs: Add write " Dave Chinner
2013-07-21  6:23 ` [PATCH 00/49] current patch queue for 3.12 Michael L. Semon
2013-07-22 23:43   ` Dave Chinner
2013-07-23  1:00     ` Michael L. Semon
2013-08-01 21:21 ` Ben Myers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=51F2772C.2010500@redhat.com \
    --to=bfoster@redhat.com \
    --cc=david@fromorbit.com \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox