| Message ID | 20191101220719.29100-25-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/34] xfs: move incore structures out of xfs_da_format.h | expand |
On Fri, Nov 01, 2019 at 03:07:09PM -0700, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig <hch@lst.de> LOL. Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/libxfs/xfs_da_format.c | 33 --------------------------------- > fs/xfs/libxfs/xfs_dir2.h | 2 -- > 2 files changed, 35 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c > index 84f8355072b4..35edf470efc8 100644 > --- a/fs/xfs/libxfs/xfs_da_format.c > +++ b/fs/xfs/libxfs/xfs_da_format.c > @@ -111,36 +111,6 @@ xfs_dir3_data_entry_tag_p( > xfs_dir3_data_entsize(dep->namelen) - sizeof(__be16)); > } > > -static struct xfs_dir2_data_entry * > -xfs_dir2_data_first_entry_p( > - struct xfs_dir2_data_hdr *hdr) > -{ > - return (struct xfs_dir2_data_entry *) > - ((char *)hdr + sizeof(struct xfs_dir2_data_hdr) + > - XFS_DIR2_DATA_ENTSIZE(1) + > - XFS_DIR2_DATA_ENTSIZE(2)); > -} > - > -static struct xfs_dir2_data_entry * > -xfs_dir2_ftype_data_first_entry_p( > - struct xfs_dir2_data_hdr *hdr) > -{ > - return (struct xfs_dir2_data_entry *) > - ((char *)hdr + sizeof(struct xfs_dir2_data_hdr) + > - XFS_DIR3_DATA_ENTSIZE(1) + > - XFS_DIR3_DATA_ENTSIZE(2)); > -} > - > -static struct xfs_dir2_data_entry * > -xfs_dir3_data_first_entry_p( > - struct xfs_dir2_data_hdr *hdr) > -{ > - return (struct xfs_dir2_data_entry *) > - ((char *)hdr + sizeof(struct xfs_dir3_data_hdr) + > - XFS_DIR3_DATA_ENTSIZE(1) + > - XFS_DIR3_DATA_ENTSIZE(2)); > -} > - > static struct xfs_dir2_data_free * > xfs_dir2_data_bestfree_p(struct xfs_dir2_data_hdr *hdr) > { > @@ -196,7 +166,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = { > XFS_DIR2_DATA_ENTSIZE(2), > .data_entry_offset = sizeof(struct xfs_dir2_data_hdr), > > - .data_first_entry_p = xfs_dir2_data_first_entry_p, > .data_entry_p = xfs_dir2_data_entry_p, > .data_unused_p = xfs_dir2_data_unused_p, > }; > @@ -216,7 +185,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = { > XFS_DIR3_DATA_ENTSIZE(2), > .data_entry_offset = sizeof(struct xfs_dir2_data_hdr), > > - .data_first_entry_p = xfs_dir2_ftype_data_first_entry_p, > .data_entry_p = xfs_dir2_data_entry_p, > .data_unused_p = xfs_dir2_data_unused_p, > }; > @@ -236,7 +204,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = { > XFS_DIR3_DATA_ENTSIZE(2), > .data_entry_offset = sizeof(struct xfs_dir3_data_hdr), > > - .data_first_entry_p = xfs_dir3_data_first_entry_p, > .data_entry_p = xfs_dir3_data_entry_p, > .data_unused_p = xfs_dir3_data_unused_p, > }; > diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h > index 0198887a1c54..20417c42ca6f 100644 > --- a/fs/xfs/libxfs/xfs_dir2.h > +++ b/fs/xfs/libxfs/xfs_dir2.h > @@ -45,8 +45,6 @@ struct xfs_dir_ops { > xfs_dir2_data_aoff_t data_first_offset; > size_t data_entry_offset; > > - struct xfs_dir2_data_entry * > - (*data_first_entry_p)(struct xfs_dir2_data_hdr *hdr); > struct xfs_dir2_data_entry * > (*data_entry_p)(struct xfs_dir2_data_hdr *hdr); > struct xfs_dir2_data_unused * > -- > 2.20.1 >
diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c index 84f8355072b4..35edf470efc8 100644 --- a/fs/xfs/libxfs/xfs_da_format.c +++ b/fs/xfs/libxfs/xfs_da_format.c @@ -111,36 +111,6 @@ xfs_dir3_data_entry_tag_p( xfs_dir3_data_entsize(dep->namelen) - sizeof(__be16)); } -static struct xfs_dir2_data_entry * -xfs_dir2_data_first_entry_p( - struct xfs_dir2_data_hdr *hdr) -{ - return (struct xfs_dir2_data_entry *) - ((char *)hdr + sizeof(struct xfs_dir2_data_hdr) + - XFS_DIR2_DATA_ENTSIZE(1) + - XFS_DIR2_DATA_ENTSIZE(2)); -} - -static struct xfs_dir2_data_entry * -xfs_dir2_ftype_data_first_entry_p( - struct xfs_dir2_data_hdr *hdr) -{ - return (struct xfs_dir2_data_entry *) - ((char *)hdr + sizeof(struct xfs_dir2_data_hdr) + - XFS_DIR3_DATA_ENTSIZE(1) + - XFS_DIR3_DATA_ENTSIZE(2)); -} - -static struct xfs_dir2_data_entry * -xfs_dir3_data_first_entry_p( - struct xfs_dir2_data_hdr *hdr) -{ - return (struct xfs_dir2_data_entry *) - ((char *)hdr + sizeof(struct xfs_dir3_data_hdr) + - XFS_DIR3_DATA_ENTSIZE(1) + - XFS_DIR3_DATA_ENTSIZE(2)); -} - static struct xfs_dir2_data_free * xfs_dir2_data_bestfree_p(struct xfs_dir2_data_hdr *hdr) { @@ -196,7 +166,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = { XFS_DIR2_DATA_ENTSIZE(2), .data_entry_offset = sizeof(struct xfs_dir2_data_hdr), - .data_first_entry_p = xfs_dir2_data_first_entry_p, .data_entry_p = xfs_dir2_data_entry_p, .data_unused_p = xfs_dir2_data_unused_p, }; @@ -216,7 +185,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = { XFS_DIR3_DATA_ENTSIZE(2), .data_entry_offset = sizeof(struct xfs_dir2_data_hdr), - .data_first_entry_p = xfs_dir2_ftype_data_first_entry_p, .data_entry_p = xfs_dir2_data_entry_p, .data_unused_p = xfs_dir2_data_unused_p, }; @@ -236,7 +204,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = { XFS_DIR3_DATA_ENTSIZE(2), .data_entry_offset = sizeof(struct xfs_dir3_data_hdr), - .data_first_entry_p = xfs_dir3_data_first_entry_p, .data_entry_p = xfs_dir3_data_entry_p, .data_unused_p = xfs_dir3_data_unused_p, }; diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h index 0198887a1c54..20417c42ca6f 100644 --- a/fs/xfs/libxfs/xfs_dir2.h +++ b/fs/xfs/libxfs/xfs_dir2.h @@ -45,8 +45,6 @@ struct xfs_dir_ops { xfs_dir2_data_aoff_t data_first_offset; size_t data_entry_offset; - struct xfs_dir2_data_entry * - (*data_first_entry_p)(struct xfs_dir2_data_hdr *hdr); struct xfs_dir2_data_entry * (*data_entry_p)(struct xfs_dir2_data_hdr *hdr); struct xfs_dir2_data_unused *
Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/libxfs/xfs_da_format.c | 33 --------------------------------- fs/xfs/libxfs/xfs_dir2.h | 2 -- 2 files changed, 35 deletions(-)