[Pkg-lustre-svn-commit] r327 - in /trunk/debian: changelog patches/00list patches/bug12567-fix-ldlm_cli_enqueue-errormsg.dpatch

pwinnertz-guest at users.alioth.debian.org pwinnertz-guest at users.alioth.debian.org
Tue Sep 18 12:14:13 UTC 2007


Author: pwinnertz-guest
Date: Tue Sep 18 12:14:13 2007
New Revision: 327

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=327
Log:
Added fix for annoying error msg

Added:
    trunk/debian/patches/bug12567-fix-ldlm_cli_enqueue-errormsg.dpatch
Modified:
    trunk/debian/changelog
    trunk/debian/patches/00list

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=327&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Sep 18 12:14:13 2007
@@ -1,10 +1,9 @@
-lustre (1.6.2-3) UNRELEASED; urgency=low
+lustre (1.6.2-3) unstable; urgency=low
 
-  [  ]
+  * Added several patches from upstream bugzilla to fix some
+    smaller bugs.
 
-  * 
-
- -- Noèl Köthe <noel at debian.org>  Tue, 18 Sep 2007 13:42:24 +0200
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Tue, 18 Sep 2007 14:15:16 +0200
 
 lustre (1.6.2-2) unstable; urgency=low
 

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=327&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Tue Sep 18 12:14:13 2007
@@ -19,6 +19,7 @@
 tex2pdf.dpatch
 2.6.21-sysctl.dpatch
 bug12691-fixtypos.dpatch
+bug12567-fix-ldlm_cli_enqueue-errormsg.dpatch
 
 # Debian patches
 autogen-run.dpatch

Added: trunk/debian/patches/bug12567-fix-ldlm_cli_enqueue-errormsg.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/bug12567-fix-ldlm_cli_enqueue-errormsg.dpatch?rev=327&op=file
==============================================================================
--- trunk/debian/patches/bug12567-fix-ldlm_cli_enqueue-errormsg.dpatch (added)
+++ trunk/debian/patches/bug12567-fix-ldlm_cli_enqueue-errormsg.dpatch Tue Sep 18 12:14:13 2007
@@ -1,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Patch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from upstream bugzilla. Fixes the thousands error msg:
+## DP: mdc_enqueue()) ldlm_cli_enqueue: -2
+
+ at DPATCH@
+diff -u -p -r1.435.2.10 handler.c
+--- lustre/mds/handler.c	3 Aug 2007 10:25:27 -0000	1.435.2.10
++++ lustre/mds/handler.c	9 Sep 2007 16:20:46 -0000
+@@ -2324,6 +2324,9 @@ void intent_set_disposition(struct ldlm_
+         rep->lock_policy_res1 |= flag;
+ }
+ 
++#define IS_CLIENT_DISCONNECT_ERROR(error) \
++                (error == -ENOTCONN || error == -ENODEV)
++
+ static int mds_intent_policy(struct ldlm_namespace *ns,
+                              struct ldlm_lock **lockp, void *req_cookie,
+                              ldlm_mode_t mode, int flags, void *data)
+@@ -2398,10 +2401,18 @@ static int mds_intent_policy(struct ldlm
+ 
+                 /* If there was an error of some sort or if we are not
+                  * returning any locks */
+-                if (rep->lock_policy_res2)
+-                        RETURN(rep->lock_policy_res2);
+-                if (!intent_disposition(rep, DISP_OPEN_LOCK))
+-                        RETURN(ELDLM_LOCK_ABORTED);
++                 if (rep->lock_policy_res2 ||
++                     !intent_disposition(rep, DISP_OPEN_LOCK)) {
++                        /* If it is the disconnect error (ENODEV & ENOCONN)
++                         * ptlrpc layer should know this imediately, it should
++                         * be replied by rq_stats, otherwise, return it by 
++                         * intent here
++                         */
++                        if (IS_CLIENT_DISCONNECT_ERROR(rep->lock_policy_res2))
++                                RETURN(rep->lock_policy_res2);
++                        else
++                                RETURN(ELDLM_LOCK_ABORTED);
++                 }
+                 break;
+         case IT_LOOKUP:
+                         getattr_part = MDS_INODELOCK_LOOKUP;




More information about the Pkg-lustre-svn-commit mailing list