[Pkg-lustre-svn-commit] updated: [298f3ad] Fix some patches for 1.6.6

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 298f3ad7951495c7f98dd7c352956432b07f9aa1
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Nov 26 11:03:49 2008 +0100

    Fix some patches for 1.6.6

diff --git a/debian/patches/00list b/debian/patches/00list
index 8289b0d..3345d84 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -5,7 +5,6 @@ posix_acl.dpatch
 2.6.21-mds-orphan_link.dpatch
 ldiskfs-detect-2.6.20-2.6.22.dpatch
 no_default_debugging.dpatch
-no-m64.dpatch
 autogen.sh.dpatch
 no-darwin.dpatch
 remove-set_tunables.dpatch
diff --git a/debian/patches/2.6.21-mds-orphan_link.dpatch b/debian/patches/2.6.21-mds-orphan_link.dpatch
index fcdfeb8..718b20a 100755
--- a/debian/patches/2.6.21-mds-orphan_link.dpatch
+++ b/debian/patches/2.6.21-mds-orphan_link.dpatch
@@ -5,19 +5,19 @@
 ## DP: Patch from Q-Leap Networks
 
 @DPATCH@
-diff -r a1bf8dcdfe1f lustre/mds/mds_reint.c
---- a/lustre/mds/mds_reint.c	Mon Jul 09 17:00:16 2007 +0200
-+++ b/lustre/mds/mds_reint.c	Mon Jul 09 17:01:04 2007 +0200
-@@ -1481,7 +1481,12 @@ static int mds_orphan_add_link(struct md
+diff -urNad lustre-1.6.6~/lustre/mds/mds_reint.c lustre-1.6.6/lustre/mds/mds_reint.c
+--- lustre-1.6.6~/lustre/mds/mds_reint.c	2008-11-26 10:42:24.000000000 +0100
++++ lustre-1.6.6/lustre/mds/mds_reint.c	2008-11-26 10:46:26.000000000 +0100
+@@ -1577,8 +1577,12 @@
           * for linking and return real mode back then -bzzz */
          mode = inode->i_mode;
          inode->i_mode = S_IFREG;
 +
-+        /* 2.6.21 will refuse to add a link of inode->i_nlink == 0 */
 +        inode->i_nlink = 1;
-         rc = vfs_link(dentry, pending_dir, pending_child);
+         rc = ll_vfs_link(dentry, mds->mds_vfsmnt, pending_dir, pending_child,
+                          mds->mds_vfsmnt);
 +        inode->i_nlink--;
-+        mark_inode_dirty(inode);
++        mark_inode_dirty(inode); 
          if (rc)
                  CERROR("error linking orphan %s to PENDING: rc = %d\n",
                         rec->ur_name, rc);
diff --git a/debian/patches/remove-set_tunables.dpatch b/debian/patches/remove-set_tunables.dpatch
index 3407b23..c7ff1c9 100755
--- a/debian/patches/remove-set_tunables.dpatch
+++ b/debian/patches/remove-set_tunables.dpatch
@@ -5,10 +5,10 @@
 ## DP: removed set tunables from mount.lustre since it doesn't work under etch
 
 @DPATCH@
-diff -urNad lustre-1.6.5-rc2~/lustre/utils/mount_lustre.c lustre-1.6.5-rc2/lustre/utils/mount_lustre.c
---- lustre-1.6.5-rc2~/lustre/utils/mount_lustre.c	2008-05-09 14:01:54.000000000 +0200
-+++ lustre-1.6.5-rc2/lustre/utils/mount_lustre.c	2008-05-09 14:03:38.000000000 +0200
-@@ -286,7 +286,10 @@
+diff -urNad lustre-1.6.6~/lustre/utils/mount_lustre.c lustre-1.6.6/lustre/utils/mount_lustre.c
+--- lustre-1.6.6~/lustre/utils/mount_lustre.c	2008-11-26 10:50:51.000000000 +0100
++++ lustre-1.6.6/lustre/utils/mount_lustre.c	2008-11-26 10:56:17.000000000 +0100
+@@ -305,7 +305,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
@@ -20,7 +20,7 @@ diff -urNad lustre-1.6.5-rc2~/lustre/utils/mount_lustre.c lustre-1.6.5-rc2/lustr
  int set_tunables(char *source, int src_len)
  {
          glob_t glob_info;
-@@ -340,10 +343,10 @@
+@@ -359,10 +362,10 @@
          if (rc != ENOENT)
                  return rc;
  
@@ -33,7 +33,7 @@ diff -urNad lustre-1.6.5-rc2~/lustre/utils/mount_lustre.c lustre-1.6.5-rc2/lustr
          dev = real_path + src_len - 1;
          while (dev > real_path) {
                  if (isdigit(*dev))
-@@ -415,7 +418,7 @@
+@@ -434,7 +437,7 @@
  out:
          globfree(&glob_info);
          return rc;
@@ -42,16 +42,16 @@ diff -urNad lustre-1.6.5-rc2~/lustre/utils/mount_lustre.c lustre-1.6.5-rc2/lustr
  
  int main(int argc, char *const argv[])
  {
-@@ -547,10 +550,10 @@
+@@ -567,10 +570,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)",
+                                 " (may cause reduced IO performance)\n",
 -                                argv[0], source);
 +                                argv[0], source);*/
  
-         if (!fake)
-                 /* flags and target get to lustre_get_sb, but not
+         register_service_tags(usource, source, target);
+ 

-- 
Lustre Debian Packaging