提交 ed67ebfd 编写于 作者: C Christoph Hellwig 提交者: Darrick J. Wong

xfs: remove the xfs_dsb_t typedef

Remove the few leftover instances of the xfs_dinode_t typedef.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Reviewed-by: NDarrick J. Wong <djwong@kernel.org>
Signed-off-by: NDarrick J. Wong <djwong@kernel.org>
上级 de38db72
...@@ -184,7 +184,7 @@ typedef struct xfs_sb { ...@@ -184,7 +184,7 @@ typedef struct xfs_sb {
* Superblock - on disk version. Must match the in core version above. * Superblock - on disk version. Must match the in core version above.
* Must be padded to 64 bit alignment. * Must be padded to 64 bit alignment.
*/ */
typedef struct xfs_dsb { struct xfs_dsb {
__be32 sb_magicnum; /* magic number == XFS_SB_MAGIC */ __be32 sb_magicnum; /* magic number == XFS_SB_MAGIC */
__be32 sb_blocksize; /* logical block size, bytes */ __be32 sb_blocksize; /* logical block size, bytes */
__be64 sb_dblocks; /* number of data blocks */ __be64 sb_dblocks; /* number of data blocks */
...@@ -263,7 +263,7 @@ typedef struct xfs_dsb { ...@@ -263,7 +263,7 @@ typedef struct xfs_dsb {
uuid_t sb_meta_uuid; /* metadata file system unique id */ uuid_t sb_meta_uuid; /* metadata file system unique id */
/* must be padded to 64 bit alignment */ /* must be padded to 64 bit alignment */
} xfs_dsb_t; };
/* /*
* Misc. Flags - warning - these will be cleared by xfs_repair unless * Misc. Flags - warning - these will be cleared by xfs_repair unless
......
...@@ -495,7 +495,7 @@ xfs_sb_quota_from_disk(struct xfs_sb *sbp) ...@@ -495,7 +495,7 @@ xfs_sb_quota_from_disk(struct xfs_sb *sbp)
static void static void
__xfs_sb_from_disk( __xfs_sb_from_disk(
struct xfs_sb *to, struct xfs_sb *to,
xfs_dsb_t *from, struct xfs_dsb *from,
bool convert_xquota) bool convert_xquota)
{ {
to->sb_magicnum = be32_to_cpu(from->sb_magicnum); to->sb_magicnum = be32_to_cpu(from->sb_magicnum);
...@@ -571,7 +571,7 @@ __xfs_sb_from_disk( ...@@ -571,7 +571,7 @@ __xfs_sb_from_disk(
void void
xfs_sb_from_disk( xfs_sb_from_disk(
struct xfs_sb *to, struct xfs_sb *to,
xfs_dsb_t *from) struct xfs_dsb *from)
{ {
__xfs_sb_from_disk(to, from, true); __xfs_sb_from_disk(to, from, true);
} }
......
...@@ -477,7 +477,7 @@ STATIC void ...@@ -477,7 +477,7 @@ STATIC void
xfs_trans_apply_sb_deltas( xfs_trans_apply_sb_deltas(
xfs_trans_t *tp) xfs_trans_t *tp)
{ {
xfs_dsb_t *sbp; struct xfs_dsb *sbp;
struct xfs_buf *bp; struct xfs_buf *bp;
int whole = 0; int whole = 0;
...@@ -541,14 +541,14 @@ xfs_trans_apply_sb_deltas( ...@@ -541,14 +541,14 @@ xfs_trans_apply_sb_deltas(
/* /*
* Log the whole thing, the fields are noncontiguous. * Log the whole thing, the fields are noncontiguous.
*/ */
xfs_trans_log_buf(tp, bp, 0, sizeof(xfs_dsb_t) - 1); xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb) - 1);
else else
/* /*
* Since all the modifiable fields are contiguous, we * Since all the modifiable fields are contiguous, we
* can get away with this. * can get away with this.
*/ */
xfs_trans_log_buf(tp, bp, offsetof(xfs_dsb_t, sb_icount), xfs_trans_log_buf(tp, bp, offsetof(struct xfs_dsb, sb_icount),
offsetof(xfs_dsb_t, sb_frextents) + offsetof(struct xfs_dsb, sb_frextents) +
sizeof(sbp->sb_frextents) - 1); sizeof(sbp->sb_frextents) - 1);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册