aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/libxfs/xfs_dir2_sf.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/libxfs/xfs_dir2_sf.c')
-rw-r--r--fs/xfs/libxfs/xfs_dir2_sf.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c
index 5079e051ef08..974d62e677f4 100644
--- a/fs/xfs/libxfs/xfs_dir2_sf.c
+++ b/fs/xfs/libxfs/xfs_dir2_sf.c
@@ -20,8 +20,6 @@
20#include "xfs_format.h" 20#include "xfs_format.h"
21#include "xfs_log_format.h" 21#include "xfs_log_format.h"
22#include "xfs_trans_resv.h" 22#include "xfs_trans_resv.h"
23#include "xfs_sb.h"
24#include "xfs_ag.h"
25#include "xfs_mount.h" 23#include "xfs_mount.h"
26#include "xfs_da_format.h" 24#include "xfs_da_format.h"
27#include "xfs_da_btree.h" 25#include "xfs_da_btree.h"
@@ -32,7 +30,6 @@
32#include "xfs_dir2.h" 30#include "xfs_dir2.h"
33#include "xfs_dir2_priv.h" 31#include "xfs_dir2_priv.h"
34#include "xfs_trace.h" 32#include "xfs_trace.h"
35#include "xfs_dinode.h"
36 33
37/* 34/*
38 * Prototypes for internal functions. 35 * Prototypes for internal functions.
@@ -455,13 +452,11 @@ xfs_dir2_sf_addname_hard(
455 xfs_dir2_sf_hdr_t *oldsfp; /* original shortform dir */ 452 xfs_dir2_sf_hdr_t *oldsfp; /* original shortform dir */
456 xfs_dir2_sf_entry_t *sfep; /* entry in new dir */ 453 xfs_dir2_sf_entry_t *sfep; /* entry in new dir */
457 xfs_dir2_sf_hdr_t *sfp; /* new shortform dir */ 454 xfs_dir2_sf_hdr_t *sfp; /* new shortform dir */
458 struct xfs_mount *mp;
459 455
460 /* 456 /*
461 * Copy the old directory to the stack buffer. 457 * Copy the old directory to the stack buffer.
462 */ 458 */
463 dp = args->dp; 459 dp = args->dp;
464 mp = dp->i_mount;
465 460
466 sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; 461 sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
467 old_isize = (int)dp->i_d.di_size; 462 old_isize = (int)dp->i_d.di_size;
@@ -542,7 +537,6 @@ xfs_dir2_sf_addname_pick(
542 xfs_inode_t *dp; /* incore directory inode */ 537 xfs_inode_t *dp; /* incore directory inode */
543 int holefit; /* found hole it will fit in */ 538 int holefit; /* found hole it will fit in */
544 int i; /* entry number */ 539 int i; /* entry number */
545 xfs_mount_t *mp; /* filesystem mount point */
546 xfs_dir2_data_aoff_t offset; /* data block offset */ 540 xfs_dir2_data_aoff_t offset; /* data block offset */
547 xfs_dir2_sf_entry_t *sfep; /* shortform entry */ 541 xfs_dir2_sf_entry_t *sfep; /* shortform entry */
548 xfs_dir2_sf_hdr_t *sfp; /* shortform structure */ 542 xfs_dir2_sf_hdr_t *sfp; /* shortform structure */
@@ -550,7 +544,6 @@ xfs_dir2_sf_addname_pick(
550 int used; /* data bytes used */ 544 int used; /* data bytes used */
551 545
552 dp = args->dp; 546 dp = args->dp;
553 mp = dp->i_mount;
554 547
555 sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; 548 sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
556 size = dp->d_ops->data_entsize(args->namelen); 549 size = dp->d_ops->data_entsize(args->namelen);
@@ -616,10 +609,8 @@ xfs_dir2_sf_check(
616 int offset; /* data offset */ 609 int offset; /* data offset */
617 xfs_dir2_sf_entry_t *sfep; /* shortform dir entry */ 610 xfs_dir2_sf_entry_t *sfep; /* shortform dir entry */
618 xfs_dir2_sf_hdr_t *sfp; /* shortform structure */ 611 xfs_dir2_sf_hdr_t *sfp; /* shortform structure */
619 struct xfs_mount *mp;
620 612
621 dp = args->dp; 613 dp = args->dp;
622 mp = dp->i_mount;
623 614
624 sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; 615 sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
625 offset = dp->d_ops->data_first_offset; 616 offset = dp->d_ops->data_first_offset;
@@ -1016,12 +1007,10 @@ xfs_dir2_sf_toino4(
1016 int oldsize; /* old inode size */ 1007 int oldsize; /* old inode size */
1017 xfs_dir2_sf_entry_t *sfep; /* new sf entry */ 1008 xfs_dir2_sf_entry_t *sfep; /* new sf entry */
1018 xfs_dir2_sf_hdr_t *sfp; /* new sf directory */ 1009 xfs_dir2_sf_hdr_t *sfp; /* new sf directory */
1019 struct xfs_mount *mp;
1020 1010
1021 trace_xfs_dir2_sf_toino4(args); 1011 trace_xfs_dir2_sf_toino4(args);
1022 1012
1023 dp = args->dp; 1013 dp = args->dp;
1024 mp = dp->i_mount;
1025 1014
1026 /* 1015 /*
1027 * Copy the old directory to the buffer. 1016 * Copy the old directory to the buffer.
@@ -1094,12 +1083,10 @@ xfs_dir2_sf_toino8(
1094 int oldsize; /* old inode size */ 1083 int oldsize; /* old inode size */
1095 xfs_dir2_sf_entry_t *sfep; /* new sf entry */ 1084 xfs_dir2_sf_entry_t *sfep; /* new sf entry */
1096 xfs_dir2_sf_hdr_t *sfp; /* new sf directory */ 1085 xfs_dir2_sf_hdr_t *sfp; /* new sf directory */
1097 struct xfs_mount *mp;
1098 1086
1099 trace_xfs_dir2_sf_toino8(args); 1087 trace_xfs_dir2_sf_toino8(args);
1100 1088
1101 dp = args->dp; 1089 dp = args->dp;
1102 mp = dp->i_mount;
1103 1090
1104 /* 1091 /*
1105 * Copy the old directory to the buffer. 1092 * Copy the old directory to the buffer.