From: Christoph Hellwig <hch@xxxxxx>
Source kernel commit: 074aea4be1a4074be49a7ec41c674cc02b52fd60
Remove the last two users of the typedef.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
Signed-off-by: Chandan Babu R <chandanbabu@xxxxxxxxxx>
Signed-off-by: Carlos Maiolino <cem@xxxxxxxxxx>
---
db/attrshort.c | 2 +-
libxfs/xfs_attr_leaf.c | 4 ++--
libxfs/xfs_attr_sf.h | 8 --------
repair/attr_repair.c | 6 +++---
repair/dinode.c | 6 +++---
5 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/db/attrshort.c b/db/attrshort.c
index c98b90be3..7c386d46f 100644
--- a/db/attrshort.c
+++ b/db/attrshort.c
@@ -25,7 +25,7 @@ const field_t attr_shortform_flds[] = {
{ NULL }
};
-#define HOFF(f) bitize(offsetof(xfs_attr_sf_hdr_t, f))
+#define HOFF(f) bitize(offsetof(struct xfs_attr_sf_hdr, f))
const field_t attr_sf_hdr_flds[] = {
{ "totsize", FLDT_UINT16D, OI(HOFF(totsize)), C1, 0, TYP_NONE },
{ "count", FLDT_UINT8D, OI(HOFF(count)), C1, 0, TYP_NONE },
diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index cf172b6ea..e3f8f67b5 100644
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -813,7 +813,7 @@ xfs_attr_sf_removename(
/*
* Fix up the start offset of the attribute fork
*/
- if (totsize == sizeof(xfs_attr_sf_hdr_t) && xfs_has_attr2(mp) &&
+ if (totsize == sizeof(struct xfs_attr_sf_hdr) && xfs_has_attr2(mp) &&
(dp->i_df.if_format != XFS_DINODE_FMT_BTREE) &&
!(args->op_flags & (XFS_DA_OP_ADDNAME | XFS_DA_OP_REPLACE))) {
xfs_attr_fork_remove(dp, args->trans);
@@ -821,7 +821,7 @@ xfs_attr_sf_removename(
xfs_idata_realloc(dp, -size, XFS_ATTR_FORK);
dp->i_forkoff = xfs_attr_shortform_bytesfit(dp, totsize);
ASSERT(dp->i_forkoff);
- ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) ||
+ ASSERT(totsize > sizeof(struct xfs_attr_sf_hdr) ||
(args->op_flags & XFS_DA_OP_ADDNAME) ||
!xfs_has_attr2(mp) ||
dp->i_df.if_format == XFS_DINODE_FMT_BTREE);
diff --git a/libxfs/xfs_attr_sf.h b/libxfs/xfs_attr_sf.h
index 9abf7de95..bc4422223 100644
--- a/libxfs/xfs_attr_sf.h
+++ b/libxfs/xfs_attr_sf.h
@@ -6,14 +6,6 @@
#ifndef __XFS_ATTR_SF_H__
#define __XFS_ATTR_SF_H__
-/*
- * Attribute storage when stored inside the inode.
- *
- * Small attribute lists are packed as tightly as possible so as
- * to fit into the literal area of the inode.
- */
-typedef struct xfs_attr_sf_hdr xfs_attr_sf_hdr_t;
-
/*
* We generate this then sort it, attr_list() must return things in hash-order.
*/
diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index b65b28a20..0d22feb4f 100644
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -224,14 +224,14 @@ process_shortform_attr(
*/
if (hdr->count == 0)
/* then the total size should just be the header length */
- if (be16_to_cpu(hdr->totsize) != sizeof(xfs_attr_sf_hdr_t)) {
+ if (be16_to_cpu(hdr->totsize) != sizeof(struct xfs_attr_sf_hdr)) {
/* whoops there's a discrepancy. Clear the hdr */
if (!no_modify) {
do_warn(
_("there are no attributes in the fork for inode %" PRIu64 "\n"),
ino);
hdr->totsize =
- cpu_to_be16(sizeof(xfs_attr_sf_hdr_t));
+ cpu_to_be16(sizeof(struct xfs_attr_sf_hdr));
*repair = 1;
return(1);
} else {
@@ -242,7 +242,7 @@ process_shortform_attr(
}
}
- currentsize = sizeof(xfs_attr_sf_hdr_t);
+ currentsize = sizeof(struct xfs_attr_sf_hdr);
remainingspace = be16_to_cpu(hdr->totsize) - currentsize;
nextentry = libxfs_attr_sf_firstentry(hdr);
for (i = 0; i < hdr->count; i++) {
diff --git a/repair/dinode.c b/repair/dinode.c
index f4398c0df..cc3f07dda 100644
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -100,7 +100,7 @@ _("would have cleared inode %" PRIu64 " attributes\n"), ino_num);
if (!no_modify) {
struct xfs_attr_sf_hdr *hdr = XFS_DFORK_APTR(dino);
- hdr->totsize = cpu_to_be16(sizeof(xfs_attr_sf_hdr_t));
+ hdr->totsize = cpu_to_be16(sizeof(struct xfs_attr_sf_hdr));
hdr->count = 0;
dino->di_forkoff = 0; /* got to do this after hdr is set */
}
@@ -1009,11 +1009,11 @@ process_lclinode(
XFS_DFORK_ASIZE(dip, mp));
return(1);
}
- if (be16_to_cpu(hdr->totsize) < sizeof(xfs_attr_sf_hdr_t)) {
+ if (be16_to_cpu(hdr->totsize) < sizeof(struct xfs_attr_sf_hdr)) {
do_warn(
_("local inode %" PRIu64 " attr too small (size = %d, min size = %zd)\n"),
lino, be16_to_cpu(hdr->totsize),
- sizeof(xfs_attr_sf_hdr_t));
+ sizeof(struct xfs_attr_sf_hdr));
return(1);
}
}
--
2.44.0
