Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xfs: clean up xfs_dir2_leaf_addname

Remove typedefs and consolidate local variable initialization.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>

+15 -18
+15 -18
fs/xfs/libxfs/xfs_dir2_leaf.c
··· 563 563 */ 564 564 int /* error */ 565 565 xfs_dir2_leaf_addname( 566 - xfs_da_args_t *args) /* operation arguments */ 566 + struct xfs_da_args *args) /* operation arguments */ 567 567 { 568 + struct xfs_dir3_icleaf_hdr leafhdr; 569 + struct xfs_trans *tp = args->trans; 568 570 __be16 *bestsp; /* freespace table in leaf */ 569 - int compact; /* need to compact leaves */ 570 - xfs_dir2_data_hdr_t *hdr; /* data block header */ 571 + __be16 *tagp; /* end of data entry */ 571 572 struct xfs_buf *dbp; /* data block buffer */ 572 - xfs_dir2_data_entry_t *dep; /* data block entry */ 573 - xfs_inode_t *dp; /* incore directory inode */ 574 - xfs_dir2_data_unused_t *dup; /* data unused entry */ 573 + struct xfs_buf *lbp; /* leaf's buffer */ 574 + struct xfs_dir2_leaf *leaf; /* leaf structure */ 575 + struct xfs_inode *dp = args->dp; /* incore directory inode */ 576 + struct xfs_dir2_data_hdr *hdr; /* data block header */ 577 + struct xfs_dir2_data_entry *dep; /* data block entry */ 578 + struct xfs_dir2_leaf_entry *lep; /* leaf entry table pointer */ 579 + struct xfs_dir2_leaf_entry *ents; 580 + struct xfs_dir2_data_unused *dup; /* data unused entry */ 581 + struct xfs_dir2_leaf_tail *ltp; /* leaf tail pointer */ 582 + struct xfs_dir2_data_free *bf; /* bestfree table */ 583 + int compact; /* need to compact leaves */ 575 584 int error; /* error return value */ 576 585 int grown; /* allocated new data block */ 577 586 int highstale = 0; /* index of next stale leaf */ 578 587 int i; /* temporary, index */ 579 588 int index; /* leaf table position */ 580 - struct xfs_buf *lbp; /* leaf's buffer */ 581 - xfs_dir2_leaf_t *leaf; /* leaf structure */ 582 589 int length; /* length of new entry */ 583 - xfs_dir2_leaf_entry_t *lep; /* leaf entry table pointer */ 584 590 int lfloglow; /* low leaf logging index */ 585 591 int lfloghigh; /* high leaf logging index */ 586 592 int lowstale = 0; /* index of prev stale leaf */ 587 - xfs_dir2_leaf_tail_t *ltp; /* leaf tail pointer */ 588 593 int needbytes; /* leaf block bytes needed */ 589 594 int needlog; /* need to log data header */ 590 595 int needscan; /* need to rescan data free */ 591 - __be16 *tagp; /* end of data entry */ 592 - xfs_trans_t *tp; /* transaction pointer */ 593 596 xfs_dir2_db_t use_block; /* data block number */ 594 - struct xfs_dir2_data_free *bf; /* bestfree table */ 595 - struct xfs_dir2_leaf_entry *ents; 596 - struct xfs_dir3_icleaf_hdr leafhdr; 597 597 598 598 trace_xfs_dir2_leaf_addname(args); 599 - 600 - dp = args->dp; 601 - tp = args->trans; 602 599 603 600 error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp); 604 601 if (error)