diff options
Diffstat (limited to 'fs/xfs/libxfs/xfs_dir2_leaf.c')
-rw-r--r-- | fs/xfs/libxfs/xfs_dir2_leaf.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c index a19174eb3cb2..106119955400 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c | |||
@@ -21,8 +21,6 @@ | |||
21 | #include "xfs_format.h" | 21 | #include "xfs_format.h" |
22 | #include "xfs_log_format.h" | 22 | #include "xfs_log_format.h" |
23 | #include "xfs_trans_resv.h" | 23 | #include "xfs_trans_resv.h" |
24 | #include "xfs_sb.h" | ||
25 | #include "xfs_ag.h" | ||
26 | #include "xfs_mount.h" | 24 | #include "xfs_mount.h" |
27 | #include "xfs_da_format.h" | 25 | #include "xfs_da_format.h" |
28 | #include "xfs_da_btree.h" | 26 | #include "xfs_da_btree.h" |
@@ -384,7 +382,6 @@ xfs_dir2_block_to_leaf( | |||
384 | xfs_dir2_db_t ldb; /* leaf block's bno */ | 382 | xfs_dir2_db_t ldb; /* leaf block's bno */ |
385 | xfs_dir2_leaf_t *leaf; /* leaf structure */ | 383 | xfs_dir2_leaf_t *leaf; /* leaf structure */ |
386 | xfs_dir2_leaf_tail_t *ltp; /* leaf's tail */ | 384 | xfs_dir2_leaf_tail_t *ltp; /* leaf's tail */ |
387 | xfs_mount_t *mp; /* filesystem mount point */ | ||
388 | int needlog; /* need to log block header */ | 385 | int needlog; /* need to log block header */ |
389 | int needscan; /* need to rescan bestfree */ | 386 | int needscan; /* need to rescan bestfree */ |
390 | xfs_trans_t *tp; /* transaction pointer */ | 387 | xfs_trans_t *tp; /* transaction pointer */ |
@@ -395,7 +392,6 @@ xfs_dir2_block_to_leaf( | |||
395 | trace_xfs_dir2_block_to_leaf(args); | 392 | trace_xfs_dir2_block_to_leaf(args); |
396 | 393 | ||
397 | dp = args->dp; | 394 | dp = args->dp; |
398 | mp = dp->i_mount; | ||
399 | tp = args->trans; | 395 | tp = args->trans; |
400 | /* | 396 | /* |
401 | * Add the leaf block to the inode. | 397 | * Add the leaf block to the inode. |
@@ -626,7 +622,6 @@ xfs_dir2_leaf_addname( | |||
626 | int lfloghigh; /* high leaf logging index */ | 622 | int lfloghigh; /* high leaf logging index */ |
627 | int lowstale; /* index of prev stale leaf */ | 623 | int lowstale; /* index of prev stale leaf */ |
628 | xfs_dir2_leaf_tail_t *ltp; /* leaf tail pointer */ | 624 | xfs_dir2_leaf_tail_t *ltp; /* leaf tail pointer */ |
629 | xfs_mount_t *mp; /* filesystem mount point */ | ||
630 | int needbytes; /* leaf block bytes needed */ | 625 | int needbytes; /* leaf block bytes needed */ |
631 | int needlog; /* need to log data header */ | 626 | int needlog; /* need to log data header */ |
632 | int needscan; /* need to rescan data free */ | 627 | int needscan; /* need to rescan data free */ |
@@ -641,7 +636,6 @@ xfs_dir2_leaf_addname( | |||
641 | 636 | ||
642 | dp = args->dp; | 637 | dp = args->dp; |
643 | tp = args->trans; | 638 | tp = args->trans; |
644 | mp = dp->i_mount; | ||
645 | 639 | ||
646 | error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp); | 640 | error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp); |
647 | if (error) | 641 | if (error) |
@@ -1356,11 +1350,9 @@ xfs_dir2_leaf_removename( | |||
1356 | xfs_dir2_leaf_t *leaf; /* leaf structure */ | 1350 | xfs_dir2_leaf_t *leaf; /* leaf structure */ |
1357 | xfs_dir2_leaf_entry_t *lep; /* leaf entry */ | 1351 | xfs_dir2_leaf_entry_t *lep; /* leaf entry */ |
1358 | xfs_dir2_leaf_tail_t *ltp; /* leaf tail structure */ | 1352 | xfs_dir2_leaf_tail_t *ltp; /* leaf tail structure */ |
1359 | xfs_mount_t *mp; /* filesystem mount point */ | ||
1360 | int needlog; /* need to log data header */ | 1353 | int needlog; /* need to log data header */ |
1361 | int needscan; /* need to rescan data frees */ | 1354 | int needscan; /* need to rescan data frees */ |
1362 | xfs_dir2_data_off_t oldbest; /* old value of best free */ | 1355 | xfs_dir2_data_off_t oldbest; /* old value of best free */ |
1363 | xfs_trans_t *tp; /* transaction pointer */ | ||
1364 | struct xfs_dir2_data_free *bf; /* bestfree table */ | 1356 | struct xfs_dir2_data_free *bf; /* bestfree table */ |
1365 | struct xfs_dir2_leaf_entry *ents; | 1357 | struct xfs_dir2_leaf_entry *ents; |
1366 | struct xfs_dir3_icleaf_hdr leafhdr; | 1358 | struct xfs_dir3_icleaf_hdr leafhdr; |
@@ -1374,8 +1366,6 @@ xfs_dir2_leaf_removename( | |||
1374 | return error; | 1366 | return error; |
1375 | } | 1367 | } |
1376 | dp = args->dp; | 1368 | dp = args->dp; |
1377 | tp = args->trans; | ||
1378 | mp = dp->i_mount; | ||
1379 | leaf = lbp->b_addr; | 1369 | leaf = lbp->b_addr; |
1380 | hdr = dbp->b_addr; | 1370 | hdr = dbp->b_addr; |
1381 | xfs_dir3_data_check(dp, dbp); | 1371 | xfs_dir3_data_check(dp, dbp); |
@@ -1607,11 +1597,9 @@ xfs_dir2_leaf_trim_data( | |||
1607 | int error; /* error return value */ | 1597 | int error; /* error return value */ |
1608 | xfs_dir2_leaf_t *leaf; /* leaf structure */ | 1598 | xfs_dir2_leaf_t *leaf; /* leaf structure */ |
1609 | xfs_dir2_leaf_tail_t *ltp; /* leaf tail structure */ | 1599 | xfs_dir2_leaf_tail_t *ltp; /* leaf tail structure */ |
1610 | xfs_mount_t *mp; /* filesystem mount point */ | ||
1611 | xfs_trans_t *tp; /* transaction pointer */ | 1600 | xfs_trans_t *tp; /* transaction pointer */ |
1612 | 1601 | ||
1613 | dp = args->dp; | 1602 | dp = args->dp; |
1614 | mp = dp->i_mount; | ||
1615 | tp = args->trans; | 1603 | tp = args->trans; |
1616 | /* | 1604 | /* |
1617 | * Read the offending data block. We need its buffer. | 1605 | * Read the offending data block. We need its buffer. |