From: Eric Sandeen <sandeen@sandeen.net>
Date: Tue, 13 Oct 2015 23:29:20 +0000 (+1100)
Subject: xfs_repair: remove type from da & dir2 cursors
X-Git-Tag: v4.3.0-rc1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54aeafa573e1a472e4522f1ff3522d8e9b9aa0b2;p=thirdparty%2Fxfsprogs-dev.git

xfs_repair: remove type from da & dir2 cursors

The type field in these cursors is only set (and only
in the attr code), and it's never read; just remove
it.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index d63bc87d8..f29a5bdc7 100644
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -67,7 +67,6 @@ typedef struct da_level_state  {
 
 typedef struct da_bt_cursor  {
 	int			active;	/* highest level in tree (# levels-1) */
-	int			type;	/* 0 if dir, 1 if attr */
 	xfs_ino_t		ino;
 	xfs_dablk_t		greatest_bno;
 	xfs_dinode_t		*dip;
@@ -1477,7 +1476,6 @@ process_node_attr(
 	 */
 	memset(&da_cursor, 0, sizeof(da_bt_cursor_t));
 	da_cursor.active = 0;
-	da_cursor.type = 0;
 	da_cursor.ino = ino;
 	da_cursor.dip = dip;
 	da_cursor.greatest_bno = 0;
diff --git a/repair/dir2.h b/repair/dir2.h
index df68d5c81..3cc1941f1 100644
--- a/repair/dir2.h
+++ b/repair/dir2.h
@@ -51,7 +51,6 @@ typedef struct dir2_level_state  {
 
 typedef struct dir2_bt_cursor  {
 	int			active;	/* highest level in tree (# levels-1) */
-	int			type;	/* 0 if dir, 1 if attr */
 	xfs_ino_t		ino;
 	xfs_dablk_t		greatest_bno;
 	xfs_dinode_t		*dip;