diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2008-02-20 14:22:22 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2008-02-20 14:22:22 +0000 |
| commit | f44873eb8a8b7d7b4ef278f7a25b9b9a1bee4ddd (patch) | |
| tree | 9e260ad4e0296509aa6ad3d933622a2f6f134694 | |
| parent | Mask USE=libffi (bug #210880). (diff) | |
| download | gentoo-2-f44873eb8a8b7d7b4ef278f7a25b9b9a1bee4ddd.tar.gz gentoo-2-f44873eb8a8b7d7b4ef278f7a25b9b9a1bee4ddd.tar.bz2 gentoo-2-f44873eb8a8b7d7b4ef278f7a25b9b9a1bee4ddd.zip | |
Got patch name wrong, fixing
(Portage version: 2.1.4.1)
| -rw-r--r-- | sys-cluster/gfs-kernel/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.22-compilefix.patch | 51 |
2 files changed, 56 insertions, 1 deletions
diff --git a/sys-cluster/gfs-kernel/ChangeLog b/sys-cluster/gfs-kernel/ChangeLog index c9990efb7c61..6c27c1a25bd2 100644 --- a/sys-cluster/gfs-kernel/ChangeLog +++ b/sys-cluster/gfs-kernel/ChangeLog @@ -1,6 +1,10 @@ # 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.26 2008/02/08 14:48:35 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.27 2008/02/20 14:22:21 caleb Exp $ + + 20 Feb 2008; Caleb Tennis <caleb@gentoo.org> + +files/gfs-kernel-1.04.00-post2.6.22-compilefix.patch: + Got the filename wrong, fixing *gfs-kernel-1.04.00-r1 (08 Feb 2008) diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.22-compilefix.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.22-compilefix.patch new file mode 100644 index 000000000000..1d2d1c16e50d --- /dev/null +++ b/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.22-compilefix.patch @@ -0,0 +1,51 @@ +--- cluster-1.04.00/gfs-kernel/src/gfs/diaper.c 2007-09-11 13:20:51.000000000 +0300 ++++ cluster-1.04.00/gfs-kernel/src/gfs/diaper.c 2007-09-11 13:20:59.000000000 +0300 +@@ -397,7 +397,7 @@ + fail_bdput: + mutex_lock(&diaper->bd_mutex); + if (!--diaper->bd_openers) { +- invalidate_bdev(diaper, 1); ++ invalidate_bdev(diaper); + diaper->bd_contains = NULL; + diaper->bd_disk = NULL; + } else +@@ -440,7 +440,7 @@ + + mutex_lock(&diaper->bd_mutex); + if (!--diaper->bd_openers) { +- invalidate_bdev(diaper, 1); ++ invalidate_bdev(diaper); + diaper->bd_contains = NULL; + diaper->bd_disk = NULL; + } else +--- cluster-1.04.00/gfs-kernel/src/gfs/ops_fstype.c 2007-02-23 22:57:29.000000000 +0200 ++++ cluster-1.04.00/gfs-kernel/src/gfs/ops_fstype.c 2007-09-11 13:50:46.000000000 +0300 +@@ -726,13 +726,6 @@ + goto error; + } + sb->s_flags |= MS_ACTIVE; +- /* Equivilant of bdev_uevent(bdev, KOBJ_MOUNT): */ +- if (real->bd_disk) { +- if (real->bd_part) +- kobject_uevent(&real->bd_part->kobj, KOBJ_MOUNT); +- else +- kobject_uevent(&real->bd_disk->kobj, KOBJ_MOUNT); +- } + } + + return simple_set_mnt(mnt, sb); +@@ -761,13 +754,6 @@ + struct block_device *real = gfs_diaper_2real(diaper); + unsigned long bsize = block_size(real); + +- /* Equivalent of bdev_uevent(bdev, KOBJ_UMOUNT); */ +- if (real->bd_disk) { +- if (real->bd_part) +- kobject_uevent(&real->bd_part->kobj, KOBJ_UMOUNT); +- else +- kobject_uevent(&real->bd_disk->kobj, KOBJ_UMOUNT); +- } + generic_shutdown_super(sb); + set_blocksize(diaper, bsize); + set_blocksize(real, bsize); + |