cluster: STABLE3 - libgfs2: fix build break caused by patch to bz 455300

Abhijith Das adas at fedoraproject.org
Fri Apr 9 22:46:25 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=dd9f2f2c9e524bf9eedadceb0714f1b04a26dd5b
Commit:        dd9f2f2c9e524bf9eedadceb0714f1b04a26dd5b
Parent:        e5e6b8a3620349e57dc1264dff3c0c613994c5fd
Author:        Abhijith Das <adas at redhat.com>
AuthorDate:    Fri Apr 9 17:39:32 2010 -0500
Committer:     Abhijith Das <adas at redhat.com>
CommitterDate: Fri Apr 9 17:39:32 2010 -0500

libgfs2: fix build break caused by patch to bz 455300

One of the patches checked in for bug 455300 overwrote
another patch to libgfs2 that correctly handled the removal
of the quota linked list from include/linux/gfs2_ondisk.h .
This patch brings back the relevant portion of the good
patch that was overwritten.

The kernel patch that removes the quota linked list
definition from include/linux/gfs2_ondisk.h only recently
went upstream so this bug only surfaced now. The build
fails with newer kernels or rawhide.

Resolves: rhbz#581038
Signed-off-by: Abhi Das <adas at redhat.com>
---
 gfs2/libgfs2/ondisk.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gfs2/libgfs2/ondisk.c b/gfs2/libgfs2/ondisk.c
index 829bb10..0d16c15 100644
--- a/gfs2/libgfs2/ondisk.c
+++ b/gfs2/libgfs2/ondisk.c
@@ -264,8 +264,7 @@ void gfs2_quota_in(struct gfs2_quota *qu, char *buf)
 	CPIN_64(qu, str, qu_limit);
 	CPIN_64(qu, str, qu_warn);
 	CPIN_64(qu, str, qu_value);
-	CPIN_32(qu, str, qu_ll_next);
-	CPIN_08(qu, str, qu_reserved, 60);
+	CPIN_08(qu, str, qu_reserved, sizeof(qu->qu_reserved));
 }
 
 void gfs2_quota_out(struct gfs2_quota *qu, char *buf)
@@ -275,8 +274,7 @@ void gfs2_quota_out(struct gfs2_quota *qu, char *buf)
 	CPOUT_64(qu, str, qu_limit);
 	CPOUT_64(qu, str, qu_warn);
 	CPOUT_64(qu, str, qu_value);
-	CPOUT_32(qu, str, qu_ll_next);
-	CPOUT_08(qu, str, qu_reserved, 60);
+	memset(qu->qu_reserved, 0, sizeof(qu->qu_reserved));
 }
 
 void gfs2_quota_print(struct gfs2_quota *qu)


More information about the cluster-commits mailing list