diff options
Diffstat (limited to 'fs/xfs/libxfs/xfs_dir2_node.c')
-rw-r--r-- | fs/xfs/libxfs/xfs_dir2_node.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index 2ae6ac2c11ae..41b80d3d3877 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.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" |
@@ -297,7 +295,6 @@ xfs_dir2_leaf_to_node( | |||
297 | int i; /* leaf freespace index */ | 295 | int i; /* leaf freespace index */ |
298 | xfs_dir2_leaf_t *leaf; /* leaf structure */ | 296 | xfs_dir2_leaf_t *leaf; /* leaf structure */ |
299 | xfs_dir2_leaf_tail_t *ltp; /* leaf tail structure */ | 297 | xfs_dir2_leaf_tail_t *ltp; /* leaf tail structure */ |
300 | xfs_mount_t *mp; /* filesystem mount point */ | ||
301 | int n; /* count of live freespc ents */ | 298 | int n; /* count of live freespc ents */ |
302 | xfs_dir2_data_off_t off; /* freespace entry value */ | 299 | xfs_dir2_data_off_t off; /* freespace entry value */ |
303 | __be16 *to; /* pointer to freespace entry */ | 300 | __be16 *to; /* pointer to freespace entry */ |
@@ -307,7 +304,6 @@ xfs_dir2_leaf_to_node( | |||
307 | trace_xfs_dir2_leaf_to_node(args); | 304 | trace_xfs_dir2_leaf_to_node(args); |
308 | 305 | ||
309 | dp = args->dp; | 306 | dp = args->dp; |
310 | mp = dp->i_mount; | ||
311 | tp = args->trans; | 307 | tp = args->trans; |
312 | /* | 308 | /* |
313 | * Add a freespace block to the directory. | 309 | * Add a freespace block to the directory. |
@@ -387,16 +383,12 @@ xfs_dir2_leafn_add( | |||
387 | int lfloghigh; /* high leaf entry logging */ | 383 | int lfloghigh; /* high leaf entry logging */ |
388 | int lfloglow; /* low leaf entry logging */ | 384 | int lfloglow; /* low leaf entry logging */ |
389 | int lowstale; /* previous stale entry */ | 385 | int lowstale; /* previous stale entry */ |
390 | xfs_mount_t *mp; /* filesystem mount point */ | ||
391 | xfs_trans_t *tp; /* transaction pointer */ | ||
392 | struct xfs_dir3_icleaf_hdr leafhdr; | 386 | struct xfs_dir3_icleaf_hdr leafhdr; |
393 | struct xfs_dir2_leaf_entry *ents; | 387 | struct xfs_dir2_leaf_entry *ents; |
394 | 388 | ||
395 | trace_xfs_dir2_leafn_add(args, index); | 389 | trace_xfs_dir2_leafn_add(args, index); |
396 | 390 | ||
397 | dp = args->dp; | 391 | dp = args->dp; |
398 | mp = dp->i_mount; | ||
399 | tp = args->trans; | ||
400 | leaf = bp->b_addr; | 392 | leaf = bp->b_addr; |
401 | dp->d_ops->leaf_hdr_from_disk(&leafhdr, leaf); | 393 | dp->d_ops->leaf_hdr_from_disk(&leafhdr, leaf); |
402 | ents = dp->d_ops->leaf_ents_p(leaf); | 394 | ents = dp->d_ops->leaf_ents_p(leaf); |
@@ -1170,7 +1162,6 @@ xfs_dir2_leafn_remove( | |||
1170 | xfs_dir2_leaf_entry_t *lep; /* leaf entry */ | 1162 | xfs_dir2_leaf_entry_t *lep; /* leaf entry */ |
1171 | int longest; /* longest data free entry */ | 1163 | int longest; /* longest data free entry */ |
1172 | int off; /* data block entry offset */ | 1164 | int off; /* data block entry offset */ |
1173 | xfs_mount_t *mp; /* filesystem mount point */ | ||
1174 | int needlog; /* need to log data header */ | 1165 | int needlog; /* need to log data header */ |
1175 | int needscan; /* need to rescan data frees */ | 1166 | int needscan; /* need to rescan data frees */ |
1176 | xfs_trans_t *tp; /* transaction pointer */ | 1167 | xfs_trans_t *tp; /* transaction pointer */ |
@@ -1182,7 +1173,6 @@ xfs_dir2_leafn_remove( | |||
1182 | 1173 | ||
1183 | dp = args->dp; | 1174 | dp = args->dp; |
1184 | tp = args->trans; | 1175 | tp = args->trans; |
1185 | mp = dp->i_mount; | ||
1186 | leaf = bp->b_addr; | 1176 | leaf = bp->b_addr; |
1187 | dp->d_ops->leaf_hdr_from_disk(&leafhdr, leaf); | 1177 | dp->d_ops->leaf_hdr_from_disk(&leafhdr, leaf); |
1188 | ents = dp->d_ops->leaf_ents_p(leaf); | 1178 | ents = dp->d_ops->leaf_ents_p(leaf); |
@@ -1323,7 +1313,6 @@ xfs_dir2_leafn_split( | |||
1323 | xfs_da_args_t *args; /* operation arguments */ | 1313 | xfs_da_args_t *args; /* operation arguments */ |
1324 | xfs_dablk_t blkno; /* new leaf block number */ | 1314 | xfs_dablk_t blkno; /* new leaf block number */ |
1325 | int error; /* error return value */ | 1315 | int error; /* error return value */ |
1326 | xfs_mount_t *mp; /* filesystem mount point */ | ||
1327 | struct xfs_inode *dp; | 1316 | struct xfs_inode *dp; |
1328 | 1317 | ||
1329 | /* | 1318 | /* |
@@ -1331,7 +1320,6 @@ xfs_dir2_leafn_split( | |||
1331 | */ | 1320 | */ |
1332 | args = state->args; | 1321 | args = state->args; |
1333 | dp = args->dp; | 1322 | dp = args->dp; |
1334 | mp = dp->i_mount; | ||
1335 | ASSERT(oldblk->magic == XFS_DIR2_LEAFN_MAGIC); | 1323 | ASSERT(oldblk->magic == XFS_DIR2_LEAFN_MAGIC); |
1336 | error = xfs_da_grow_inode(args, &blkno); | 1324 | error = xfs_da_grow_inode(args, &blkno); |
1337 | if (error) { | 1325 | if (error) { |
@@ -2231,12 +2219,10 @@ xfs_dir2_node_trim_free( | |||
2231 | xfs_inode_t *dp; /* incore directory inode */ | 2219 | xfs_inode_t *dp; /* incore directory inode */ |
2232 | int error; /* error return code */ | 2220 | int error; /* error return code */ |
2233 | xfs_dir2_free_t *free; /* freespace structure */ | 2221 | xfs_dir2_free_t *free; /* freespace structure */ |
2234 | xfs_mount_t *mp; /* filesystem mount point */ | ||
2235 | xfs_trans_t *tp; /* transaction pointer */ | 2222 | xfs_trans_t *tp; /* transaction pointer */ |
2236 | struct xfs_dir3_icfree_hdr freehdr; | 2223 | struct xfs_dir3_icfree_hdr freehdr; |
2237 | 2224 | ||
2238 | dp = args->dp; | 2225 | dp = args->dp; |
2239 | mp = dp->i_mount; | ||
2240 | tp = args->trans; | 2226 | tp = args->trans; |
2241 | /* | 2227 | /* |
2242 | * Read the freespace block. | 2228 | * Read the freespace block. |