latest gfs2-nmw headers break userland build

PATCH In review Fabio Massimo Di Nitto 2 participants 2 messages May 22, 2007 – May 29, 2007

lore

Share & tools

lore

Fabio Massimo Di Nitto

author

2007-05-22 07:00 UTC #0 lore raw

PATCH 1/1 latest gfs2-nmw headers break userland build

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

Signature · 5 lines

I'm going to make him an offer he can't refuse.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: gfs2_ondisk.diff
URL: <http://listman.redhat.com/archives/cluster-devel/attachments/20070522/0d2213ae/attachment.ksh>

Steven Whitehouse

2007-05-29 09:03 UTC #1 lore raw

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.

Quoted 35 lines · Fabio Massimo Di Nitto

Hi Steven,
2e8701a15cd6f7c95e74d6660615a69b09e453ef commit breaks libgfs2 build:
gcc -Wall -I/usr/src/ubuntu/mypkgs/rhcluster/cluster/config -DHELPER_PROGRAM
(quoted diff) +0 -2
-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)
include/linux/gfs2_ondisk.h +1 -1
index 028f981..9ecf929 100644
@@ -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 */