rpms/cluster/devel gfs2_fix_build_with_new_kernels.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 cluster.spec, 1.69, 1.70 sources, 1.37, 1.38
Fabio M. Di Nitto
fabbione at fedoraproject.org
Sat Apr 10 04:02:25 UTC 2010
- Previous message: rpms/389-ds-base/devel 389-ds-base-git-local.sh, 1.9, 1.10 389-ds-base-git.sh, 1.10, 1.11
- Next message: rpms/fence-agents/devel .cvsignore, 1.20, 1.21 fence-agents.spec, 1.27, 1.28 sources, 1.20, 1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: fabbione
Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7979
Modified Files:
.cvsignore cluster.spec sources
Added Files:
gfs2_fix_build_with_new_kernels.patch
Log Message:
New upstream release
gfs2_fix_build_with_new_kernels.patch:
ondisk.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- NEW FILE gfs2_fix_build_with_new_kernels.patch ---
commit dd9f2f2c9e524bf9eedadceb0714f1b04a26dd5b
Author: Abhijith Das <adas at redhat.com>
Date: 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>
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)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore 2 Mar 2010 09:45:33 -0000 1.36
+++ .cvsignore 10 Apr 2010 04:02:24 -0000 1.37
@@ -1 +1 @@
-cluster-3.0.9.tar.bz2
+cluster-3.0.10.tar.bz2
Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- cluster.spec 2 Mar 2010 09:51:46 -0000 1.69
+++ cluster.spec 10 Apr 2010 04:02:24 -0000 1.70
@@ -18,12 +18,13 @@
Name: cluster
Summary: Red Hat Cluster
-Version: 3.0.9
+Version: 3.0.10
Release: 1%{?alphatag:.%{alphatag}}%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Base
URL: http://sources.redhat.com/cluster/wiki/
Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz2
+Patch0: gfs2_fix_build_with_new_kernels.patch
## Setup/build bits
@@ -40,6 +41,7 @@ BuildRequires: cluster-glue-libs-devel p
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1
%build
./configure \
@@ -264,6 +266,18 @@ fi
%{_mandir}/man8/*gfs2*
%changelog
+* Fri Apr 9 2010 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.10-1
+- new upstream release
+ Resolves: rhbz#519491, rhbz#570525, rhbz#571806, rhbz#574027
+ Resolves: rhbz#574215, rhbz#574886, rhbz#576322, rhbz#576335
+ Resolves: rhbz#575103, rhbz#577856, rhbz#577874, rhbz#578249
+ Resolves: rhbz#578625, rhbz#578626, rhbz#578628, rhbz#578626
+ Resolves: rhbz#579621, rhbz#579623, rhbz#579625, rhbz#579626
+ Resolves: rhbz#579059
+- Add gfs2_fix_build_with_new_kernels.patch to build with
+ more recent kernels > 2.6.33 (patch is already upstream).
+ Resolves: rhbz#581038
+
* Mon Mar 1 2010 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.9-1
- new upstream release
Resolves: rhbz#455300, rhbz#568446, rhbz#561862, rhbz#536902
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources 2 Mar 2010 09:45:33 -0000 1.37
+++ sources 10 Apr 2010 04:02:24 -0000 1.38
@@ -1 +1 @@
-9ae8803d40e4423455ae3cc8f4c81151 cluster-3.0.9.tar.bz2
+a6d2231935ce0d8a13b4568fc797f00c cluster-3.0.10.tar.bz2
- Previous message: rpms/389-ds-base/devel 389-ds-base-git-local.sh, 1.9, 1.10 389-ds-base-git.sh, 1.10, 1.11
- Next message: rpms/fence-agents/devel .cvsignore, 1.20, 1.21 fence-agents.spec, 1.27, 1.28 sources, 1.20, 1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list