From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9022 invoked by alias); 31 Aug 2009 17:34:15 -0000 Received: (qmail 9016 invoked by alias); 31 Aug 2009 17:34:15 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - GFS2: gfs2_edit prints wrong directory entry type for gfs1 To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: e3d5be1efbc63c7c5809633be8411ae302974dab X-Git-Newrev: 81ada023e8280a0199dd5e646fd475c6ed0f56e0 From: Bob Peterson Message-Id: <20090831173325.C483B1201D4@lists.fedorahosted.org> Date: Mon, 31 Aug 2009 17:34:00 -0000 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00266.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=81ada023e8280a0199dd5e646fd475c6ed0f56e0 Commit: 81ada023e8280a0199dd5e646fd475c6ed0f56e0 Parent: e3d5be1efbc63c7c5809633be8411ae302974dab Author: Bob Peterson AuthorDate: Mon Aug 31 12:03:20 2009 -0500 Committer: Bob Peterson CommitterDate: Mon Aug 31 12:03:20 2009 -0500 GFS2: gfs2_edit prints wrong directory entry type for gfs1 This patch adds the ability for gfs2_edit to correctly interpret gfs1 directory entry types. rhbz#503529 --- gfs2/edit/hexedit.c | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 5a01b1f..03ca673 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1178,6 +1178,38 @@ static int has_indirect_blocks(void) /* ------------------------------------------------------------------------ */ static void print_inode_type(__be16 de_type) { + if (gfs1) { + switch(de_type) { + case GFS_FILE_NON: + print_gfs2("Unknown"); + break; + case GFS_FILE_REG: + print_gfs2("File "); + break; + case GFS_FILE_DIR: + print_gfs2("Dir "); + break; + case GFS_FILE_LNK: + print_gfs2("Symlink"); + break; + case GFS_FILE_BLK: + print_gfs2("BlkDev "); + break; + case GFS_FILE_CHR: + print_gfs2("ChrDev "); + break; + case GFS_FILE_FIFO: + print_gfs2("Fifo "); + break; + case GFS_FILE_SOCK: + print_gfs2("Socket "); + break; + default: + print_gfs2("%04x ", de_type); + break; + } + return; + } switch(de_type) { case DT_UNKNOWN: print_gfs2("Unknown"); @@ -1242,10 +1274,8 @@ static int display_leaf(struct iinfo *ind) strcpy(edit_fmt, "%"PRIx64); } } - print_gfs2("%d. (%d). %lld (0x%llx) / %lld (0x%llx): ", + print_gfs2("%d. (%d). %lld (0x%llx): ", total_dirents, d + 1, - ind->ii[0].dirent[d].dirent.de_inum.no_formal_ino, - ind->ii[0].dirent[d].dirent.de_inum.no_formal_ino, ind->ii[0].dirent[d].block, ind->ii[0].dirent[d].block); }