diff --git a/[refs] b/[refs]
index 80e2d992b063..8e0498a1bc9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 639aca417d91ebba1077a6084e4423af1c1dd811
+refs/heads/master: 518bbde33f7a6b4e252ea2591c77ef796065afa8
diff --git a/trunk/include/linux/gfs2_ondisk.h b/trunk/include/linux/gfs2_ondisk.h
index 028f9810ba07..9ecf92941b23 100644
--- a/trunk/include/linux/gfs2_ondisk.h
+++ b/trunk/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 */