From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 29 May 2007 10:03:07 +0100
Subject: [Cluster-devel] Re: [PATCH] latest gfs2-nmw headers break userland
	build
In-Reply-To: <46529508.2050006@ubuntu.com>
References: <46529508.2050006@ubuntu.com>
Message-ID: <1180429387.25918.49.camel@quoit>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Hi,

This is now in the -nmw git tree along with Dave's patch for the DLM
issue. Thanks for the patch, and as you`ve probably gathered, I'm back
from my holiday now,

Steve.

On Tue, 2007-05-22 at 09:00 +0200, Fabio Massimo Di Nitto wrote:
> Hi Steven,
> 
> 2e8701a15cd6f7c95e74d6660615a69b09e453ef commit breaks libgfs2 build:
> 
> gcc -Wall -I/usr/src/ubuntu/mypkgs/rhcluster/cluster/config -DHELPER_PROGRAM 
> -D_FILE_OFFSET_BITS=64 -DGFS2_RELEASE_NAME=\"2.0\" -ggdb  -I/usr/include 
> -I../include -I../libgfs2 -c -o gfs2hex.o gfs2hex.c
> In file included from hexedit.h:22,
>                   from gfs2hex.c:27:
> /usr/include/linux/gfs2_ondisk.h:505: error: expected specifier-qualifier-list 
> before ?u32?
> make[2]: *** [gfs2hex.o] Error 1
> make[2]: Leaving directory `/usr/src/ubuntu/mypkgs/rhcluster/cluster/gfs2/edit'
> make[1]: *** [all] Error 2
> make[1]: Leaving directory `/usr/src/ubuntu/mypkgs/rhcluster/cluster/gfs2'
> make: *** [gfs2] Error 2
> 
> Patch in attachment fixes the problem.
> 
> Fabio
> 
> plain text document attachment (gfs2_ondisk.diff)
> diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
> index 028f981..9ecf929 100644
> --- a/include/linux/gfs2_ondisk.h
> +++ b/include/linux/gfs2_ondisk.h
> @@ -502,7 +502,7 @@ struct gfs2_quota_change_host {
>  
>  struct gfs2_quota_lvb {
>          __be32 qb_magic;
> -        u32 __pad;
> +        __u32 __pad;
>          __be64 qb_limit;      /* Hard limit of # blocks to alloc */
>          __be64 qb_warn;       /* Warn user when alloc is above this # */
>          __be64 qb_value;       /* Current # blocks allocated */