[Pkg-lustre-svn-commit] r379 - in /trunk/debian/patches: 00list remove-set_tunables.dpatch

[pwinnertz-guest at users.alioth.debian.org]

Author: pwinnertz-guest
Date: Wed Oct 31 12:55:07 2007
New Revision: 379

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=379
Log:
Corrected patch (/me should think before typing)

Modified:
    trunk/debian/patches/00list
    trunk/debian/patches/remove-set_tunables.dpatch

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=379&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Wed Oct 31 12:55:07 2007
@@ -12,6 +12,8 @@
 autogen.sh.dpatch
 2.6.21-sysctl.dpatch
 bug13438-fix-mballoc-bogus-BUGON.dpatch
+remove-set_tunables.dpatch
+autogen-run.dpatch
 
 # Debian patches
 bash_completion.dpatch

Modified: trunk/debian/patches/remove-set_tunables.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/remove-set_tunables.dpatch?rev=379&op=diff
==============================================================================
--- trunk/debian/patches/remove-set_tunables.dpatch (original)
+++ trunk/debian/patches/remove-set_tunables.dpatch Wed Oct 31 12:55:07 2007
@@ -7,16 +7,47 @@
 @DPATCH@
 diff -urNad lustre-1.6.3~/lustre/utils/mount_lustre.c lustre-1.6.3/lustre/utils/mount_lustre.c
 --- lustre-1.6.3~/lustre/utils/mount_lustre.c	2007-09-26 23:47:59.000000000 +0200
-+++ lustre-1.6.3/lustre/utils/mount_lustre.c	2007-10-31 13:39:16.000000000 +0100
-@@ -278,6 +278,11 @@
-  * to the value of /sys/block/{dev}/queue/max_hw_sectors_kb */
++++ lustre-1.6.3/lustre/utils/mount_lustre.c	2007-10-31 13:55:23.000000000 +0100
+@@ -275,7 +275,10 @@
+ 
+ /* 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.
  int set_tunables(char *source, int src_len)
  {
-+        /*Quick & dirty fix, since this function doesn't compile on etch
-+         * Since we need lustre on etch too, we disable the tunables atm
-+         * until a better fix is there. */
-+        return 1;
-+
          glob_t glob_info;
-         struct stat stat_buf;
-         char *chk_major, *chk_minor;
+@@ -320,7 +323,7 @@
+         /* 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 = source + src_len - 1;
+         while (dev > source) {
+                 if (isdigit(*dev))
+@@ -388,7 +391,7 @@
+                                 path, strerror(errno));
+         }
+         return rc;
+-}
++} */
+ 
+ int main(int argc, char *const argv[])
+ {
+@@ -520,10 +523,10 @@
+                 printf("mounting device %s at %s, flags=%#x options=%s\n",
+                        source, target, flags, optcopy);
+ 
+-        if (set_tunables(source, strlen(source)) && verbose)
++        /*if (set_tunables(source, strlen(source)) && verbose)
+                 fprintf(stderr, "%s: unable to set tunables for %s"
+                                 " (may cause reduced IO performance)",
+-                                argv[0], source);
++                                argv[0], source);*/
+ 
+         if (!fake)
+                 /* flags and target get to lustre_get_sb, but not