patch-2.4.22 linux-2.4.22/fs/lockd/svcproc.c
Next file: linux-2.4.22/fs/locks.c
Previous file: linux-2.4.22/fs/lockd/svclock.c
Back to the patch index
Back to the overall index
- Lines: 40
- Date:
2003-08-25 04:44:43.000000000 -0700
- Orig file:
linux-2.4.21/fs/lockd/svcproc.c
- Orig date:
2002-11-28 15:53:15.000000000 -0800
diff -urN linux-2.4.21/fs/lockd/svcproc.c linux-2.4.22/fs/lockd/svcproc.c
@@ -490,6 +490,22 @@
}
/*
+ * client sent a GRANTED_RES, let's remove the associated block
+ */
+static int
+nlmsvc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp,
+ void *resp)
+{
+ if (!nlmsvc_ops)
+ return rpc_success;
+
+ dprintk("lockd: GRANTED_RES called\n");
+
+ nlmsvc_grant_reply(&argp->cookie, argp->status);
+ return rpc_success;
+}
+
+/*
* This is the generic lockd callback for async RPC calls
*/
static u32
@@ -552,7 +568,6 @@
#define nlmsvc_proc_lock_res nlmsvc_proc_null
#define nlmsvc_proc_cancel_res nlmsvc_proc_null
#define nlmsvc_proc_unlock_res nlmsvc_proc_null
-#define nlmsvc_proc_granted_res nlmsvc_proc_null
struct nlm_void { int dummy; };
@@ -589,7 +604,7 @@
PROC(lock_res, lockres, norep, res, void, 1),
PROC(cancel_res, cancelres, norep, res, void, 1),
PROC(unlock_res, unlockres, norep, res, void, 1),
- PROC(granted_res, grantedres, norep, res, void, 1),
+ PROC(granted_res, res, norep, res, void, 1),
/* statd callback */
PROC(sm_notify, reboot, void, reboot, void, 1),
PROC(none, void, void, void, void, 1),
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)