Got patch name wrong, fixing
authorCaleb Tennis <caleb@gentoo.org>
Wed, 20 Feb 2008 14:22:22 +0000 (14:22 +0000)
committerCaleb Tennis <caleb@gentoo.org>
Wed, 20 Feb 2008 14:22:22 +0000 (14:22 +0000)
Package-Manager: portage-2.1.4.1

sys-cluster/gfs-kernel/ChangeLog
sys-cluster/gfs-kernel/Manifest
sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.22-compilefix.patch [new file with mode: 0644]

index c9990efb7c613de26725e35e50f3dc0ebd1ff34b..6c27c1a25bd2bb2492b1930714faa74dca013c05 100644 (file)
@@ -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)
 
index 54a4cc85a5a8b084632589b393669958ffdfcd43..c70c01c61a4ff19d124da53e10901daafcbc6b40 100644 (file)
@@ -3,6 +3,7 @@ AUX gfs-kernel-1.03.00-post-2.6.18.patch 8019 RMD160 db788c7ac8f95e02e1ee2311461
 AUX gfs-kernel-1.03.00-pre2.6.17-compilefix.patch 3849 RMD160 3c6900e139cea9f9b8b04848dd649c185c0f855e SHA1 00e58fb1ed0372e8119f196da3f919acea18db37 SHA256 0653c19687038b93500b764ed3e9c6aa556b25bc80498a56939f78b429245949
 AUX gfs-kernel-1.04.00-post2.6.12-compilefix.patch 1551 RMD160 1b4e7596ed6551475b2291a27377ee389d0e3972 SHA1 b1f4702f0fbe1497c73dcbaa280b92992ba1f6d0 SHA256 55cc92e258d592f177a3b361d1d2ed10d9c88013790ccfe700a3079425fb9e59
 AUX gfs-kernel-1.04.00-post2.6.17-compilefix.patch 1449 RMD160 ad68ebc1853633a43e5528c950f9c7d048c9d136 SHA1 610541fff4b6fcb2ee0e1a24a72f0d2fbf668c49 SHA256 275fa240097bc2ac43ec00b8b23008670f3403e96c275b1a607994108a4ea6e4
+AUX gfs-kernel-1.04.00-post2.6.22-compilefix.patch 1551 RMD160 1b4e7596ed6551475b2291a27377ee389d0e3972 SHA1 b1f4702f0fbe1497c73dcbaa280b92992ba1f6d0 SHA256 55cc92e258d592f177a3b361d1d2ed10d9c88013790ccfe700a3079425fb9e59
 DIST cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 SHA1 d74cadb1ef21d1cfda333b20d7ef20272e0002d6 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849
 DIST cluster-1.03.00.tar.gz 1658274 RMD160 6fc16e2edba73dd1a83ecfad749b1553eca6d938 SHA1 c205d8ec034433c33f26724f7f69b0028d2a63d4 SHA256 e61c2438c7ee8d546aec9dd86ee1851c9a71f127c25ad1fb0c59eb4ed534e97b
 DIST cluster-1.04.00.tar.gz 1663798 RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 SHA1 af3bb244a11a6a26c31b142009f6c1f771799337 SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2
@@ -13,5 +14,5 @@ EBUILD gfs-kernel-1.02.00-r2.ebuild 2188 RMD160 7b5fd209d242e89c9d904563c7e377c9
 EBUILD gfs-kernel-1.03.00-r1.ebuild 1648 RMD160 042e61b167aac82c950f87532a6ada82eed8c9f1 SHA1 4b49788a558dee9682c8c1c4a62e14d7f7e1ecd3 SHA256 28855d299b07b5b71f2d6b9b588d7e2e8d00ebf53c2c76c5b622ffbb5d9e78e4
 EBUILD gfs-kernel-1.04.00-r1.ebuild 1823 RMD160 6682ebf5232729eb6850a571ee301c7054cff8cd SHA1 a1da94b2b475f384931d01e7a1325ebb9e2d1ec2 SHA256 f3074d673bcbd8e92fb35b6308267eb2a1bb54ccc24804168d122a8809e75297
 EBUILD gfs-kernel-1.04.00.ebuild 1601 RMD160 f79501e80c19afb7119e7d2cfe872d7640202cc3 SHA1 247aec0788d49911ac288df42c42c48b9f3ddc5a SHA256 0bf50dbbee4a9df233ad3c20bdb06d3a8abac85bbec5590238aa607866b47ece
-MISC ChangeLog 4640 RMD160 2e31c3ea3d5d369271dcf054a939d56a93dd246d SHA1 41cce11c050fff86d53d33f25f0b3d0137dffef3 SHA256 0eaeebe6e685ec444ddbc47e56577317cc0e2b3fa2c77fca503f83024df6b71b
+MISC ChangeLog 4778 RMD160 3a31e4a81dc499d12613e2e13f5a6b99d343ebcb SHA1 453e254e5e12a501a38fb9280dbd2867f584b1cb SHA256 f8d089d17cf396f843870d4da80678994c35abf8389be139bda85a3aea7aac87
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
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 (file)
index 0000000..1d2d1c1
--- /dev/null
@@ -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);
+