Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 9383e745e23602bc45f9c92184feea59 > files > 113

gfs2-utils-0.1.62-28.el5.src.rpm

commit febb943bb57ff440578ea7d0aeadf0d281a3158c
Author: Abhijith Das <adas@redhat.com>
Date:   Thu May 6 19:53:48 2010 -0500

    libgfs2: fix build break caused by recent patch
    
    One of the recent patches to libgfs2 broke 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.
    
    Resolves: rhbz#589815
    Signed-off-by: Abhi Das <adas@redhat.com>

diff --git a/gfs2/libgfs2/ondisk.c b/gfs2/libgfs2/ondisk.c
index e41d380..d15cd21 100644
--- a/gfs2/libgfs2/ondisk.c
+++ b/gfs2/libgfs2/ondisk.c
@@ -278,8 +278,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)
@@ -289,8 +288,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)