diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2018-04-03 11:13:57 -0500 |
|---|---|---|
| committer | Eric Sandeen <sandeen@sandeen.net> | 2018-04-03 11:13:57 -0500 |
| commit | 28a4f9c05e57bcd6ce463ecb81e2f0efd284c46d (patch) | |
| tree | 5188e9a07aab27aee626bead8cec817c38dfec64 | |
| parent | 42fa89bc1b8dc8723b7556e0b843a3f030a3d6eb (diff) | |
| download | xfsprogs-dev-28a4f9c05e57bcd6ce463ecb81e2f0efd284c46d.tar.gz | |
xfsprogs: remove unused delete_attr_ok
delete_attr_ok is never set to anything but 1;
remove it and all associated code.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | repair/dinode.c | 13 | ||||
| -rw-r--r-- | repair/globals.h | 1 | ||||
| -rw-r--r-- | repair/xfs_repair.c | 1 |
3 files changed, 4 insertions, 11 deletions
diff --git a/repair/dinode.c b/repair/dinode.c index 07bcf80ea5..9af4f058af 100644 --- a/repair/dinode.c +++ b/repair/dinode.c @@ -2093,14 +2093,9 @@ process_inode_attr_fork( do_warn(_("bad attribute fork in inode %" PRIu64), lino); if (!no_modify) { - if (delete_attr_ok) { - do_warn(_(", clearing attr fork\n")); - *dirty += clear_dinode_attr(mp, dino, lino); - dino->di_aformat = XFS_DINODE_FMT_LOCAL; - } else { - do_warn("\n"); - *dirty += clear_dinode(mp, dino, lino); - } + do_warn(_(", clearing attr fork\n")); + *dirty += clear_dinode_attr(mp, dino, lino); + dino->di_aformat = XFS_DINODE_FMT_LOCAL; ASSERT(*dirty > 0); } else { do_warn(_(", would clear attr fork\n")); @@ -2111,7 +2106,7 @@ process_inode_attr_fork( blkmap_free(ablkmap); *retval = 1; - return delete_attr_ok ? 0 : 1; + return 0; } if (check_dups) { diff --git a/repair/globals.h b/repair/globals.h index 519254229a..e777ba275a 100644 --- a/repair/globals.h +++ b/repair/globals.h @@ -94,7 +94,6 @@ EXTERN int dangerously; /* live dangerously ... fix ro mount */ EXTERN int isa_file; EXTERN int zap_log; EXTERN int dumpcore; /* abort, not exit on fatal errs */ -EXTERN int delete_attr_ok; /* can clear attrs w/o clearing files */ EXTERN int force_geo; /* can set geo on low confidence info */ EXTERN int assume_xfs; /* assume we have an xfs fs */ EXTERN char *log_name; /* Name of log device */ diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c index c2106e4b64..b2a243204c 100644 --- a/repair/xfs_repair.c +++ b/repair/xfs_repair.c @@ -198,7 +198,6 @@ process_args(int argc, char **argv) zap_log = 0; dumpcore = 0; full_ino_ex_data = 0; - delete_attr_ok = 1; force_geo = 0; assume_xfs = 0; copied_sunit = 0; |