Merge lp:~csurbhi/ubuntu/maverick/redhat-cluster/redhat-cluster-fix.600984 into lp:ubuntu/maverick/redhat-cluster

[Surbhi Palande]

This patch fixes the bug #600984 on LP. It makes the following changes to fix the compilation error(s) while building redhat-cluster package:

1) changes bdev_hardsect_size() to bdev_logical_block_size()
2) changes generic_file_aio_write_nolock() to generic_file_aio_write()
3) changes the default include dir for nss and nspr to be /usr/include/nss and /usr/include/nspr respectively

Please do consider merging this for maverick.

[Colin Watson (cjwatson)]

Thanks for this.

This merge doesn't seem to fix the build failure bug. I get the same
failure when test-building it as I do when test-building the package in
the archive.

As a matter of convention, we usually put Ubuntu patches at the end of
the patch queue, i.e. run 'quilt push -a' before creating the patch, and
I'd suggest using some kind of similar numbering scheme rather than
having the Debian patch have four digits at the start and the Ubuntu
patch have two. (You can just edit the series file when in the 'quilt
pop -a' state to move the existing patch around.)

Why does configure need to be patched? debian/rules already passes
--nssincdir and --nsprincdir, so it shouldn't matter what their defaults
are.

[Sebastien Bacher (seb128)]

the build failure has been fixed now, is that request still valid or should it be deleted now?

[Benjamin Drung (bdrung)]

Superseded by version 3.0.12-2ubuntu1

review: Disapprove

Unmerged revisions

33. By Surbhi Palande on 2010-07-14

* Fixed a compilation error by doing the following changes:
  - changed bdev_hardsect_size() to bdev_logical_block_size()
  - changed generic_file_aio_write_nolock() to generic_file_aio_write()
  - changed the default include dir for nss and nspr to be /usr/include/nss
  and /usr/include/nspr respectively (LP: #600984)

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-27 18:20:36 +0000
+++ debian/changelog	2010-07-14 09:25:57 +0000
@@ -1,3 +1,13 @@
+redhat-cluster (3.0.2-2ubuntu4) maverick; urgency=low
+
+  * Fixed a compilation error by doing the following changes: 
+    - changed bdev_hardsect_size() to bdev_logical_block_size()
+    - changed generic_file_aio_write_nolock() to generic_file_aio_write()
+    - changed the default include dir for nss and nspr to be /usr/include/nss
+    and /usr/include/nspr respectively (LP: #600984)
+
+ -- Surbhi Palande <[e-mail]>  Wed, 14 Jul 2010 12:05:39 +0300
+
 redhat-cluster (3.0.2-2ubuntu3) lucid; urgency=low
 
   * debian/gfs2-tools.links: Fix symlinks (LP: #549415)
 
=== added file 'debian/patches/02-compilation-err-fix.patch'
--- debian/patches/02-compilation-err-fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02-compilation-err-fix.patch	2010-07-14 09:25:57 +0000
@@ -0,0 +1,70 @@
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -251,9 +251,9 @@
+   print "--openaisincdir=\tthe base directory for openais include files.  (Default: {incdir})\n";
+   print "--openaislibdir=\tthe base directory for openais libraries.  (Default: {libdir}/openais)\n";
+   print "--corosyncbin=\tlocation of corosync executable file.  (Default: /usr/sbin/corosync)\n";
+-  print "--nssincdir=\tthe base directory for libnss include files.  (Default: {incdir}/nss3)\n";
++  print "--nssincdir=\tthe base directory for libnss include files.  (Default: {incdir}/nss)\n";
+   print "--nsslibdir=\tthe base directory for libnss libraries.  (Default: {libdir})\n";
+-  print "--nsprincdir=\tthe base directory for libnspr include files.  (Default: {incdir}/nspr4)\n";
++  print "--nsprincdir=\tthe base directory for libnspr include files.  (Default: {incdir}/nspr)\n";
+   print "--nsprlibdir=\tthe base directory for libnspr libraries.  (Default: {libdir})\n";
+   print "--virtincdir=\tthe base directory for libvirt include files.  (Default: {incdir}/libvirt)\n";
+   print "--virtlibdir=\tthe base directory for libvirt libraries.  (Default: {libdir})\n";
+@@ -509,13 +509,13 @@
+   $corosyncbin="/usr/sbin/corosync";
+ }
+ if (!$nssincdir) {
+-  $nssincdir="${incdir}/nss3";
++  $nssincdir="${incdir}/nss";
+ }
+ if (!$nsslibdir) {
+   $nsslibdir="${libdir}";
+ }
+ if (!$nsprincdir) {
+-  $nsprincdir="${incdir}/nspr4";
++  $nsprincdir="${incdir}/nspr";
+ }
+ if (!$nsprlibdir) {
+   $nsprlibdir="${libdir}";
+Index: b/gfs-kernel/src/gfs/ops_file.c
+===================================================================
+--- a/gfs-kernel/src/gfs/ops_file.c
++++ b/gfs-kernel/src/gfs/ops_file.c
+@@ -352,7 +352,7 @@
+ 		goto out_gunlock;
+ 
+ 	if (gfs_is_stuffed(ip)) {
+-		size_t mask = bdev_hardsect_size(inode->i_sb->s_bdev) - 1;
++		size_t mask = bdev_logical_block_size(inode->i_sb->s_bdev) - 1;
+ 
+ 		if (((*offset) & mask) || (((unsigned long)buf) & mask))
+ 			goto out_gunlock;
+@@ -508,7 +508,7 @@
+                 kiocb = iocb;
+         
+         kiocb->ki_pos = *offset;
+-        count = generic_file_aio_write_nolock(kiocb, &local_iov, kiocb->ki_nr_segs,
++        count = generic_file_aio_write(kiocb, &local_iov, kiocb->ki_nr_segs,
+                                                                                   kiocb->ki_pos);
+         *offset = kiocb->ki_pos;
+         if (kiocb == &local_iocb && count == -EIOCBQUEUED)
+Index: b/gfs-kernel/src/gfs/ops_fstype.c
+===================================================================
+--- a/gfs-kernel/src/gfs/ops_fstype.c
++++ b/gfs-kernel/src/gfs/ops_fstype.c
+@@ -300,9 +300,9 @@
+ 	      sizes, version #s, locations of important on-disk inodes, etc.  */
+ 
+ 	error = -EINVAL;
+-	if (sdp->sd_sb.sb_bsize < bdev_hardsect_size(sb->s_bdev)) {
++	if (sdp->sd_sb.sb_bsize < bdev_logical_block_size(sb->s_bdev)) {
+ 		printk("GFS: fsid=%s: FS block size (%u) is too small for device block size (%u)\n",
+-		       sdp->sd_fsname, sdp->sd_sb.sb_bsize, bdev_hardsect_size(sb->s_bdev));
++		       sdp->sd_fsname, sdp->sd_sb.sb_bsize, bdev_logical_block_size(sb->s_bdev));
+ 		goto fail;
+ 	}
+ 	if (sdp->sd_sb.sb_bsize > PAGE_SIZE) {
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2009-09-03 19:20:08 +0000
+++ debian/patches/series	2010-07-14 09:25:57 +0000
@@ -1,1 +1,2 @@
+02-compilation-err-fix.patch
 0001-add-dlm-kernel-headers.patch