[Pkg-lustre-svn-commit] r488 - in /trunk/debian: changelog patches/00list patches/operation_101_unconnected_mgs.dpatch

[winnie at users.alioth.debian.org]

Author: winnie
Date: Thu Sep  4 13:07:04 2008
New Revision: 488

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=488
Log:
Start working on -2

Added:
    trunk/debian/patches/operation_101_unconnected_mgs.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=488&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Thu Sep  4 13:07:04 2008
@@ -1,3 +1,9 @@
+lustre (1.6.5.1-2) unstable; urgency=low
+
+  * Add patch from bugzilla to fix 101 Error msg. 
+
+ -- Patrick Winnertz <winnie at debian.org>  Thu, 04 Sep 2008 15:04:18 +0200
+
 lustre (1.6.5.1-1) unstable; urgency=low
 
   * New upstream version 

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=488&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Thu Sep  4 13:07:04 2008
@@ -11,6 +11,7 @@
 remove-set_tunables.dpatch
 libsysio.dpatch
 bug12769-ql-fix.dpatch
+operation_101_unconnected_mgs.dpatch
 
 # Debian patches
 bash_completion.dpatch

Added: trunk/debian/patches/operation_101_unconnected_mgs.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/operation_101_unconnected_mgs.dpatch?rev=488&op=file
==============================================================================
--- trunk/debian/patches/operation_101_unconnected_mgs.dpatch (added)
+++ trunk/debian/patches/operation_101_unconnected_mgs.dpatch Thu Sep  4 13:07:04 2008
@@ -1,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove-set_tunables.dpatch by Patrick Winnertz <winnie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: patch from bugzilla (#16237) to fix lustre_mgs: operation 101 on
+## DP: unconnected MGS problem
+
+ at DPATCH@
+--- lustre+chaos4.orig/lustre/mgs/mgs_handler.c
++++ lustre+chaos4/lustre/mgs/mgs_handler.c
+@@ -83,6 +83,25 @@ static int mgs_connect(struct lustre_han
+         RETURN(rc);
+ }
+ 
++static int mgs_reconnect(struct obd_export *exp, struct obd_device *obd,
++                         struct obd_uuid *cluuid, struct obd_connect_data *data)
++{
++        ENTRY;
++
++        if (exp == NULL || obd == NULL || cluuid == NULL)
++                RETURN(-EINVAL);
++
++        mgs_counter_incr(exp, LPROC_MGS_CONNECT);
++
++        if (data != NULL) {
++                data->ocd_connect_flags &= MGS_CONNECT_SUPPORTED;
++                exp->exp_connect_flags = data->ocd_connect_flags;
++                data->ocd_version = LUSTRE_VERSION_CODE;
++        }
++
++        RETURN(0);
++}
++
+ static int mgs_disconnect(struct obd_export *exp)
+ {
+         int rc;
+@@ -702,6 +721,7 @@ out_free:
+ static struct obd_ops mgs_obd_ops = {
+         .o_owner           = THIS_MODULE,
+         .o_connect         = mgs_connect,
++        .o_reconnect       = mgs_reconnect,
+         .o_disconnect      = mgs_disconnect,
+         .o_setup           = mgs_setup,
+         .o_precleanup      = mgs_precleanup,