Commit 70a20655 authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Darrick J. Wong

Get rid of xfs_buf_log_item_t typedef

Take advantage of the rework on xfs_buf log items list, to get rid of
ths typedef for xfs_buf_log_item.

This patch also fix some indentation alignment issues found along the way.
Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarBill O'Donnell <billodo@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 75d4a13b
...@@ -880,7 +880,7 @@ xfs_buf_item_log_segment( ...@@ -880,7 +880,7 @@ xfs_buf_item_log_segment(
*/ */
void void
xfs_buf_item_log( xfs_buf_item_log(
xfs_buf_log_item_t *bip, struct xfs_buf_log_item *bip,
uint first, uint first,
uint last) uint last)
{ {
...@@ -943,7 +943,7 @@ xfs_buf_item_dirty_format( ...@@ -943,7 +943,7 @@ xfs_buf_item_dirty_format(
STATIC void STATIC void
xfs_buf_item_free( xfs_buf_item_free(
xfs_buf_log_item_t *bip) struct xfs_buf_log_item *bip)
{ {
xfs_buf_item_free_format(bip); xfs_buf_item_free_format(bip);
kmem_free(bip->bli_item.li_lv_shadow); kmem_free(bip->bli_item.li_lv_shadow);
...@@ -961,7 +961,7 @@ void ...@@ -961,7 +961,7 @@ void
xfs_buf_item_relse( xfs_buf_item_relse(
xfs_buf_t *bp) xfs_buf_t *bp)
{ {
xfs_buf_log_item_t *bip = bp->b_fspriv; struct xfs_buf_log_item *bip = bp->b_fspriv;
trace_xfs_buf_item_relse(bp, _RET_IP_); trace_xfs_buf_item_relse(bp, _RET_IP_);
ASSERT(!(bip->bli_item.li_flags & XFS_LI_IN_AIL)); ASSERT(!(bip->bli_item.li_flags & XFS_LI_IN_AIL));
......
...@@ -50,7 +50,7 @@ struct xfs_buf_log_item; ...@@ -50,7 +50,7 @@ struct xfs_buf_log_item;
* needed to log buffers. It tracks how many times the lock has been * needed to log buffers. It tracks how many times the lock has been
* locked, and which 128 byte chunks of the buffer are dirty. * locked, and which 128 byte chunks of the buffer are dirty.
*/ */
typedef struct xfs_buf_log_item { struct xfs_buf_log_item {
xfs_log_item_t bli_item; /* common item structure */ xfs_log_item_t bli_item; /* common item structure */
struct xfs_buf *bli_buf; /* real buffer pointer */ struct xfs_buf *bli_buf; /* real buffer pointer */
unsigned int bli_flags; /* misc flags */ unsigned int bli_flags; /* misc flags */
...@@ -59,11 +59,11 @@ typedef struct xfs_buf_log_item { ...@@ -59,11 +59,11 @@ typedef struct xfs_buf_log_item {
int bli_format_count; /* count of headers */ int bli_format_count; /* count of headers */
struct xfs_buf_log_format *bli_formats; /* array of in-log header ptrs */ struct xfs_buf_log_format *bli_formats; /* array of in-log header ptrs */
struct xfs_buf_log_format __bli_format; /* embedded in-log header */ struct xfs_buf_log_format __bli_format; /* embedded in-log header */
} xfs_buf_log_item_t; };
int xfs_buf_item_init(struct xfs_buf *, struct xfs_mount *); int xfs_buf_item_init(struct xfs_buf *, struct xfs_mount *);
void xfs_buf_item_relse(struct xfs_buf *); void xfs_buf_item_relse(struct xfs_buf *);
void xfs_buf_item_log(xfs_buf_log_item_t *, uint, uint); void xfs_buf_item_log(struct xfs_buf_log_item *, uint, uint);
bool xfs_buf_item_dirty_format(struct xfs_buf_log_item *); bool xfs_buf_item_dirty_format(struct xfs_buf_log_item *);
void xfs_buf_attach_iodone(struct xfs_buf *, void xfs_buf_attach_iodone(struct xfs_buf *,
void(*)(struct xfs_buf *, xfs_log_item_t *), void(*)(struct xfs_buf *, xfs_log_item_t *),
......
...@@ -139,7 +139,7 @@ xfs_trans_get_buf_map( ...@@ -139,7 +139,7 @@ xfs_trans_get_buf_map(
xfs_buf_flags_t flags) xfs_buf_flags_t flags)
{ {
xfs_buf_t *bp; xfs_buf_t *bp;
xfs_buf_log_item_t *bip; struct xfs_buf_log_item *bip;
if (!tp) if (!tp)
return xfs_buf_get_map(target, map, nmaps, flags); return xfs_buf_get_map(target, map, nmaps, flags);
...@@ -188,12 +188,13 @@ xfs_trans_get_buf_map( ...@@ -188,12 +188,13 @@ xfs_trans_get_buf_map(
* mount structure. * mount structure.
*/ */
xfs_buf_t * xfs_buf_t *
xfs_trans_getsb(xfs_trans_t *tp, xfs_trans_getsb(
xfs_trans_t *tp,
struct xfs_mount *mp, struct xfs_mount *mp,
int flags) int flags)
{ {
xfs_buf_t *bp; xfs_buf_t *bp;
xfs_buf_log_item_t *bip; struct xfs_buf_log_item *bip;
/* /*
* Default to just trying to lock the superblock buffer * Default to just trying to lock the superblock buffer
...@@ -352,10 +353,11 @@ xfs_trans_read_buf_map( ...@@ -352,10 +353,11 @@ xfs_trans_read_buf_map(
* brelse() call. * brelse() call.
*/ */
void void
xfs_trans_brelse(xfs_trans_t *tp, xfs_trans_brelse(
xfs_trans_t *tp,
xfs_buf_t *bp) xfs_buf_t *bp)
{ {
xfs_buf_log_item_t *bip; struct xfs_buf_log_item *bip;
int freed; int freed;
/* /*
...@@ -456,10 +458,11 @@ xfs_trans_brelse(xfs_trans_t *tp, ...@@ -456,10 +458,11 @@ xfs_trans_brelse(xfs_trans_t *tp,
*/ */
/* ARGSUSED */ /* ARGSUSED */
void void
xfs_trans_bhold(xfs_trans_t *tp, xfs_trans_bhold(
xfs_trans_t *tp,
xfs_buf_t *bp) xfs_buf_t *bp)
{ {
xfs_buf_log_item_t *bip = bp->b_fspriv; struct xfs_buf_log_item *bip = bp->b_fspriv;
ASSERT(bp->b_transp == tp); ASSERT(bp->b_transp == tp);
ASSERT(bip != NULL); ASSERT(bip != NULL);
...@@ -476,10 +479,11 @@ xfs_trans_bhold(xfs_trans_t *tp, ...@@ -476,10 +479,11 @@ xfs_trans_bhold(xfs_trans_t *tp,
* for this transaction. * for this transaction.
*/ */
void void
xfs_trans_bhold_release(xfs_trans_t *tp, xfs_trans_bhold_release(
xfs_trans_t *tp,
xfs_buf_t *bp) xfs_buf_t *bp)
{ {
xfs_buf_log_item_t *bip = bp->b_fspriv; struct xfs_buf_log_item *bip = bp->b_fspriv;
ASSERT(bp->b_transp == tp); ASSERT(bp->b_transp == tp);
ASSERT(bip != NULL); ASSERT(bip != NULL);
...@@ -603,7 +607,7 @@ xfs_trans_binval( ...@@ -603,7 +607,7 @@ xfs_trans_binval(
xfs_trans_t *tp, xfs_trans_t *tp,
xfs_buf_t *bp) xfs_buf_t *bp)
{ {
xfs_buf_log_item_t *bip = bp->b_fspriv; struct xfs_buf_log_item *bip = bp->b_fspriv;
int i; int i;
ASSERT(bp->b_transp == tp); ASSERT(bp->b_transp == tp);
...@@ -658,7 +662,7 @@ xfs_trans_inode_buf( ...@@ -658,7 +662,7 @@ xfs_trans_inode_buf(
xfs_trans_t *tp, xfs_trans_t *tp,
xfs_buf_t *bp) xfs_buf_t *bp)
{ {
xfs_buf_log_item_t *bip = bp->b_fspriv; struct xfs_buf_log_item *bip = bp->b_fspriv;
ASSERT(bp->b_transp == tp); ASSERT(bp->b_transp == tp);
ASSERT(bip != NULL); ASSERT(bip != NULL);
...@@ -682,7 +686,7 @@ xfs_trans_stale_inode_buf( ...@@ -682,7 +686,7 @@ xfs_trans_stale_inode_buf(
xfs_trans_t *tp, xfs_trans_t *tp,
xfs_buf_t *bp) xfs_buf_t *bp)
{ {
xfs_buf_log_item_t *bip = bp->b_fspriv; struct xfs_buf_log_item *bip = bp->b_fspriv;
ASSERT(bp->b_transp == tp); ASSERT(bp->b_transp == tp);
ASSERT(bip != NULL); ASSERT(bip != NULL);
...@@ -707,7 +711,7 @@ xfs_trans_inode_alloc_buf( ...@@ -707,7 +711,7 @@ xfs_trans_inode_alloc_buf(
xfs_trans_t *tp, xfs_trans_t *tp,
xfs_buf_t *bp) xfs_buf_t *bp)
{ {
xfs_buf_log_item_t *bip = bp->b_fspriv; struct xfs_buf_log_item *bip = bp->b_fspriv;
ASSERT(bp->b_transp == tp); ASSERT(bp->b_transp == tp);
ASSERT(bip != NULL); ASSERT(bip != NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment