From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 47C9E7F5F for ; Thu, 8 Aug 2013 17:05:15 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay1.corp.sgi.com (Postfix) with ESMTP id 0A9808F8081 for ; Thu, 8 Aug 2013 15:05:13 -0700 (PDT) Received: from sandeen.net (sandeen.net [63.231.237.45]) by cuda.sgi.com with ESMTP id didFgOdRQcNlswtF for ; Thu, 08 Aug 2013 15:05:12 -0700 (PDT) Message-ID: <52041617.1020508@sandeen.net> Date: Thu, 08 Aug 2013 17:05:11 -0500 From: Eric Sandeen MIME-Version: 1.0 Subject: Re: [PATCH 5/14] xfsprogs: sync commit f5f3d9b016 completely References: <1370564771-4929-1-git-send-email-david@fromorbit.com> <20130806214154.GM3111@sgi.com> <20130808210600.GN3111@sgi.com> <20130808212012.GS3111@sgi.com> In-Reply-To: <20130808212012.GS3111@sgi.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Ben Myers Cc: xfs@oss.sgi.com On 8/8/13 4:20 PM, Ben Myers wrote: > TODO > > --- > include/xfs_dir2_format.h | 2 +- > libxfs/xfs_dir2_data.c | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) > > Index: b/include/xfs_dir2_format.h > =================================================================== > --- a/include/xfs_dir2_format.h 2013-08-06 12:52:58.830818621 -0500 > +++ b/include/xfs_dir2_format.h 2013-08-06 12:53:38.550877679 -0500 > @@ -247,7 +247,7 @@ typedef struct xfs_dir2_data_free { > */ > typedef struct xfs_dir2_data_hdr { > __be32 magic; /* XFS_DIR2_DATA_MAGIC or */ > - /* XFS_DIR2_BLOCK_MAGIC */ > + /* XFS_DIR2_BLOCK_MAGIC */ > xfs_dir2_data_free_t bestfree[XFS_DIR2_DATA_FD_COUNT]; > } xfs_dir2_data_hdr_t; > > Index: b/libxfs/xfs_dir2_data.c > =================================================================== > --- a/libxfs/xfs_dir2_data.c 2013-08-06 12:54:17.540817693 -0500 > +++ b/libxfs/xfs_dir2_data.c 2013-08-06 12:55:10.460877745 -0500 > @@ -54,6 +54,7 @@ __xfs_dir2_data_check( > p = (char *)xfs_dir3_data_entry_p(hdr); > > switch (be32_to_cpu(hdr->magic)) { > + /* XXX bpm endian switch does not match commit */ in userspace, for some reason, doing it the "kernel way" (i.e. switch (hdr->magic) { case cpu_to_be32(XFS_DIR2_BLOCK_MAGIC): ...) yields: xfs_dir2_data.c:57: error: case label does not reduce to an integer constant -Eric > case XFS_DIR2_BLOCK_MAGIC: > case XFS_DIR3_BLOCK_MAGIC: > btp = xfs_dir2_block_tail_p(mp, hdr); > @@ -203,6 +204,7 @@ xfs_dir2_data_reada_verify( > struct xfs_dir2_data_hdr *hdr = bp->b_addr; > > switch (be32_to_cpu(hdr->magic)) { > + /* XXX bpm: endian switch does not match kernel commit */ > case XFS_DIR2_BLOCK_MAGIC: > case XFS_DIR3_BLOCK_MAGIC: > bp->b_ops = &xfs_dir3_block_buf_ops; > _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs