Message-ID: <536AA99E.6070108@linux.vnet.ibm.com>
Date: Wed, 07 May 2014 14:46:06 -0700
From: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Reply-To: jvrao@linux.vnet.ibm.com
MIME-Version: 1.0
To: linux-nfs@vger.kernel.org
CC: Rong Zeng <rongzeng@us.ibm.com>,
        Steve Dickson <steved-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH] Adding a callback for incoming sm_notify.
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Sender: linux-nfs-owner@vger.kernel.org

From: rong zeng <rongzeng@oc1547780626.ibm.com>

1. "sm-notify"                  callout name
2. monitored client name as in the SM_NOTIFY request
3. IP of the sender of the SM_NOITFY request.
4. state value in the SM_NOTIFY request

This new interface can be used by different HA-NFS product
in its specific configuration and environment to
recover from the client crash and stale lock scenarios.

Signed-off-by: Rong Zeng <rongzeng@us.ibm.com>
Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
---
  utils/statd/callback.c |   13 ++++++++-----
  1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/utils/statd/callback.c b/utils/statd/callback.c
index d1cc139..58ba70b 100644
--- a/utils/statd/callback.c
+++ b/utils/statd/callback.c
@@ -15,6 +15,7 @@
  #include "rpcmisc.h"
  #include "statd.h"
  #include "notlist.h"
+#include "ha-callout.h"

  /* Callback notify list. */
  /* notify_list *cbnl = NULL; ... never used */
@@ -87,6 +88,13 @@ sm_notify_1_svc(struct stat_chge *argp, struct 
svc_req *rqstp)
           xlog(D_CALL, "Received SM_NOTIFY from %s, state: %d",
                                      argp->mon_name, argp->state);

+         if (!statd_present_address(sap, ip_addr, sizeof(ip_addr))) {
+                  xlog_warn("Unrecognized sender address");
+                  return ((void *) &result);
+         }
+
+         ha_callout("sm-notify", argp->mon_name, ip_addr, argp->state);
+
           /* quick check - don't bother if we're not monitoring anyone */
           if (rtnl == NULL) {
                    xlog_warn("SM_NOTIFY from %s while not monitoring 
any hosts",
@@ -94,11 +102,6 @@ sm_notify_1_svc(struct stat_chge *argp, struct 
svc_req *rqstp)
                    return ((void *) &result);
           }

-         if (!statd_present_address(sap, ip_addr, sizeof(ip_addr))) {
-                  xlog_warn("Unrecognized sender address");
-                  return ((void *) &result);
-         }
-
           /* okir change: statd doesn't remove the remote host from its
            * internal monitor list when receiving an SM_NOTIFY call from
            * it. Lockd will want to continue monitoring the remote host
-- 
1.7.1