diff options
| author |   Christian Zoffoli <xmerlin@gentoo.org> | 2008-03-21 13:32:32 +0000 |
|---|---|---|
| committer | Christian Zoffoli <xmerlin@gentoo.org> | 2008-03-21 13:32:32 +0000 |
| commit | fde744c460f43d2d769b878c5bba7c869694bec4 (patch) | |
| tree | 2548f0b00106794ad6f2969471b7506124cbdf94 /sys-cluster/gfs-kernel | |
| parent | Stable on x86 wrt bug #214130 (diff) | |
| download | gentoo-2-fde744c460f43d2d769b878c5bba7c869694bec4.tar.gz gentoo-2-fde744c460f43d2d769b878c5bba7c869694bec4.tar.bz2 gentoo-2-fde744c460f43d2d769b878c5bba7c869694bec4.zip | |
Fixed wrong locking order.
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-cluster/gfs-kernel')
| -rw-r--r-- | sys-cluster/gfs-kernel/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-fix_wrong_locking_order.diff | 20 | ||||
| -rw-r--r-- | sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild | 6 |
3 files changed, 30 insertions, 3 deletions
diff --git a/sys-cluster/gfs-kernel/ChangeLog b/sys-cluster/gfs-kernel/ChangeLog index 57732cf54bd0..4c95bb553b38 100644 --- a/sys-cluster/gfs-kernel/ChangeLog +++ b/sys-cluster/gfs-kernel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/gfs-kernel # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.30 2008/03/21 02:21:04 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.31 2008/03/21 13:32:32 xmerlin Exp $ + + 21 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> + +files/gfs-kernel-2.02.00-fix_wrong_locking_order.diff, + gfs-kernel-2.02.00.ebuild: + Fixed wrong locking order. 21 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> +files/gfs-kernel-2.02.00-before-2.6.23.diff, diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-fix_wrong_locking_order.diff b/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-fix_wrong_locking_order.diff new file mode 100644 index 000000000000..c96663d29b92 --- /dev/null +++ b/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-fix_wrong_locking_order.diff @@ -0,0 +1,20 @@ +--- cluster-2.02.00/gfs-kernel/src/gfs/ops_inode.c.old 2008-03-21 11:44:44.000000000 +0000 ++++ cluster-2.02.00/gfs-kernel/src/gfs/ops_inode.c 2008-03-21 11:45:08.000000000 +0000 +@@ -150,14 +150,14 @@ + inode = gfs_iget(ip, CREATE); + gfs_inode_put(ip); + ++ gfs_glock_dq_uninit(&d_gh); ++ gfs_glock_dq_uninit(&i_gh); ++ + if (!inode) + error = -ENOMEM; + else + error = gfs_security_init(dip, ip); + +- gfs_glock_dq_uninit(&d_gh); +- gfs_glock_dq_uninit(&i_gh); +- + if (error) + return error; + diff --git a/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild index 9bcf3dea424c..44f3c4f70618 100644 --- a/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild +++ b/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild,v 1.2 2008/03/21 02:21:04 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild,v 1.3 2008/03/21 13:32:32 xmerlin Exp $ inherit eutils linux-mod linux-info versionator @@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="=virtual/linux-sources-2.6.24*" +DEPEND=">=virtual/linux-sources-2.6.20" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}/${PN}" @@ -44,6 +44,8 @@ src_unpack() { epatch "${FILESDIR}"/${P}-before-2.6.23.diff || die fi fi + + epatch "${FILESDIR}"/${P}-fix_wrong_locking_order.diff || die } src_compile() { |