[Pkg-lustre-svn-commit] updated: [cca7a2c] Rediffed remove-set_tunables patch to fix this compilation problem:

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit cca7a2cdaf86f6689843a57e8508654b827828d0
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Aug 12 14:25:48 2009 +0200

    Rediffed remove-set_tunables patch to fix this compilation problem:
    
        ../../../../lustre/utils/mount_lustre.c:410:30: error: "/*" within comment
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/remove-set_tunables.dpatch b/debian/patches/remove-set_tunables.dpatch
index 471e062..a9a45d5 100755
--- a/debian/patches/remove-set_tunables.dpatch
+++ b/debian/patches/remove-set_tunables.dpatch
@@ -6,53 +6,37 @@
 
 @DPATCH@
 diff -urNad lustre~/lustre/utils/mount_lustre.c lustre/lustre/utils/mount_lustre.c
---- lustre~/lustre/utils/mount_lustre.c	2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/utils/mount_lustre.c	2009-03-12 10:44:12.000000000 +0100
-@@ -320,7 +320,10 @@
- 
+--- lustre~/lustre/utils/mount_lustre.c	2009-08-11 15:19:03.000000000 +0200
++++ lustre/lustre/utils/mount_lustre.c	2009-08-12 14:33:20.000000000 +0200
+@@ -330,6 +330,7 @@
  /* This is to tune the kernel for good SCSI performance.
   * For that we set the value of /sys/block/{dev}/queue/max_sectors_kb
-- * to the value of /sys/block/{dev}/queue/max_hw_sectors_kb */
-+ * to the value of /sys/block/{dev}/queue/max_hw_sectors_kb 
-+ *
-+ * Commented out, since this doesn't compile on etch
-+ * This is only a quick & dirty fix, we'll search for a better one.
+  * to the value of /sys/block/{dev}/queue/max_hw_sectors_kb */
++#if 0
  int set_tunables(char *source, int src_len)
  {
          glob_t glob_info;
-@@ -374,10 +377,10 @@
-         if (rc != ENOENT)
-                 return rc;
- 
--        /* The name of the device say 'X' specified in /dev/X may not
-+        * The name of the device say 'X' specified in /dev/X may not
-          * match any entry under /sys/block/. In that case we need to
-          * match the major/minor number to find the entry under
--         * sys/block corresponding to /dev/X */
-+         * sys/block corresponding to /dev/X *
-         dev = real_path + src_len - 1;
-         while (dev > real_path) {
-                 if (isdigit(*dev))
-@@ -449,7 +452,7 @@
- out:
+@@ -459,6 +460,7 @@
          globfree(&glob_info);
          return rc;
--}
-+} */
+ }
++#endif
  
  int main(int argc, char *const argv[])
  {
-@@ -582,11 +585,11 @@
+@@ -601,13 +603,13 @@
+         if (verbose)
                  printf("mounting device %s at %s, flags=%#x options=%s\n",
                         source, target, flags, optcopy);
- 
--        if (!strstr(usource, ":/") && set_tunables(source, strlen(source)) &&
-+        /*if (!strstr(usource, ":/") && set_tunables(source, strlen(source)) &&
+-
++#if 0
+         if (!strstr(usource, ":/") && set_tunables(source, strlen(source)) &&
              verbose)
                  fprintf(stderr, "%s: unable to set tunables for %s"
                                  " (may cause reduced IO performance)\n",
--                                argv[0], source);
-+                                argv[0], source);*/
- 
+                                 argv[0], source);
+-
++#endif
          register_service_tags(usource, source, target);
  
+         if (!fake) {

-- 
Lustre Debian Packaging