[Pkg-lustre-svn-commit] r342 - in /trunk/debian/patches: 00list bug12627-fix-lfs-listnotonlyfiles.dpatch

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

Author: pwinnertz-guest
Date: Wed Sep 19 13:35:31 2007
New Revision: 342

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=342
Log:
Revert change from last commit... only the order of the patches was wrong

Modified:
    trunk/debian/patches/00list
    trunk/debian/patches/bug12627-fix-lfs-listnotonlyfiles.dpatch

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=342&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Wed Sep 19 13:35:31 2007
@@ -21,10 +21,13 @@
 bug12567-fix-ldlm_cli_enqueue-errormsg.dpatch
 bug12704-fix-2tb-ost-corruption.dpatch
 bug13030-fix-nfs-export-norootsquash.dpatch
+bug12052-fix-loopin_lsm_lmm_verify_common.dpatch
 bug12627-fix-lfs-listnotonlyfiles.dpatch
-bug12052-fix-loopin_lsm_lmm_verify_common.dpatch
-bug12644-fix-FIEMAP.dpatch
 
 # Debian patches
 autogen-run.dpatch
 lustre_config.dpatch
+
+
+#discuss needed
+#bug12644-fix-FIEMAP.dpatch

Modified: trunk/debian/patches/bug12627-fix-lfs-listnotonlyfiles.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/bug12627-fix-lfs-listnotonlyfiles.dpatch?rev=342&op=diff
==============================================================================
--- trunk/debian/patches/bug12627-fix-lfs-listnotonlyfiles.dpatch (original)
+++ trunk/debian/patches/bug12627-fix-lfs-listnotonlyfiles.dpatch Wed Sep 19 13:35:31 2007
@@ -1,16 +1,52 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: lfs lists not only files patch from bugzilla
+## DP: lfs lists not only files
 
 
 @DPATCH@
-diff -urNad lustre-1.6.2~/lustre/tests/sanity.sh lustre-1.6.2/lustre/tests/sanity.sh
---- lustre-1.6.2~/lustre/tests/sanity.sh	2007-09-19 15:24:02.000000000 +0200
-+++ lustre-1.6.2/lustre/tests/sanity.sh	2007-09-19 15:24:54.000000000 +0200
-@@ -2483,6 +2483,14 @@
+diff -u -p -r1.28.2.7 liblustreapi.c
+--- ./lustre/utils/liblustreapi.c	30 Aug 2007 19:35:32 -0000	1.28.2.7
++++ ./lustre/utils/liblustreapi.c	12 Sep 2007 07:16:49 -0000
+@@ -133,7 +133,6 @@ int llapi_file_open(const char *name, in
+                 if (errno != EEXIST && errno != EALREADY)
+                         errmsg = strerror(errno);
+ 
+-                rc = -errno;
+                 fprintf(stderr, "error on ioctl "LPX64" for '%s' (%d): %s\n",
+                         (__u64)LL_IOC_LOV_SETSTRIPE, name, fd, errmsg);
+         }
+@@ -784,10 +783,12 @@ static int cb_find_init(char *path, DIR 
+                 decision = -1;
+ 
+         /* If a OST UUID is given, and some OST matches, check it here. */
+-        if (decision != -1 && param->obdindex != OBD_NOT_FOUND &&
+-            S_ISREG(st->st_mode)) {
+-                /* Only those files should be accepted, which have a strip on
+-                 * the specified OST. */
++        if (decision != -1 && param->obdindex != OBD_NOT_FOUND) {
++                if (!S_ISREG(st->st_mode))
++                        goto decided;
++
++                /* Only those files should be accepted, which have a
++                 * stripe on the specified OST. */
+                 if (!param->lmd->lmd_lmm.lmm_stripe_count) {
+                         decision = -1;
+                 } else {
+@@ -846,6 +847,7 @@ static int cb_find_init(char *path, DIR 
+                         printf("\n");
+         }
+ 
++decided:
+         /* Do not get down anymore? */
+         if (param->depth == param->maxdepth)
+                 return 1;
+diff -u -p -r1.100.6.47 sanity.sh
+--- ./lustre/tests/sanity.sh	8 Sep 2007 17:13:20 -0000	1.100.6.47
++++ ./lustre/tests/sanity.sh	12 Sep 2007 07:08:19 -0000
+@@ -2368,6 +2368,14 @@ test_56h() {
  }
- run_test 56i "check 'lfs find -ost UUID' skips directories ======="
+ run_test 56h "check lfs find ! -name ============================="
  
 +test_56i() {
 +	mkdir -p $DIR/$tdir
@@ -21,17 +57,5 @@
 +run_test 56i "check 'lfs find -ost UUID' skips directories ======="
 +
  test_57a() {
- 	[ -z "$MDS" ] && skip "skipping test for remote MDS" && return
- 	for DEV in `cat $LPROC/mds/*/mntdev`; do
-diff -urNad lustre-1.6.2~/lustre/utils/liblustreapi.c lustre-1.6.2/lustre/utils/liblustreapi.c
---- lustre-1.6.2~/lustre/utils/liblustreapi.c	2007-09-19 15:24:02.000000000 +0200
-+++ lustre-1.6.2/lustre/utils/liblustreapi.c	2007-09-19 15:27:12.000000000 +0200
-@@ -771,6 +771,8 @@
+ 	remote_mds && skip "remote MDS" && return
  
-         /* If a OST UUID is given, and some OST matches, check it here. */
-         if (decision != -1 && param->obdindex != OBD_NOT_FOUND) {
-+                if (!S_ISREG(st->st_mode))
-+                        goto decided;
-                 /* Only those files should be accepted, which have a strip on
-                  * the specified OST. */
-                 if (!param->lmd->lmd_lmm.lmm_stripe_count) {