summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaliy Gusev <gusev.vitaliy@nexenta.com>2012-07-22 00:00:47 +0000
committerVitaliy Gusev <gusev.vitaliy@nexenta.com>2012-07-22 00:00:47 +0000
commitafb25078f70983c5c6b030be78ebcda3b2d8e79c (patch)
tree6250613c60eb6fa7bbef52123e39806b3049945f
parent82b6a9dcaf3fba09f06b436a62d844089892b956 (diff)
downloadillumos-joyent-afb25078f70983c5c6b030be78ebcda3b2d8e79c.tar.gz
417 Stale OpenOwner entries are not reaped for active clients
Reviewed by: Albert Lee <trisk@nexenta.com> Approved by: Gordon Ross <gwr@nexenta.com>
-rw-r--r--usr/src/uts/common/fs/nfs/nfs4_state.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/usr/src/uts/common/fs/nfs/nfs4_state.c b/usr/src/uts/common/fs/nfs/nfs4_state.c
index 9c300ec5d0..d148d45ff3 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_state.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_state.c
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
*/
#include <sys/systm.h>
@@ -2021,15 +2022,12 @@ openowner_mkkey(rfs4_entry_t u_entry)
return (&oo->ro_owner);
}
+/* ARGSUSED */
static bool_t
rfs4_openowner_expiry(rfs4_entry_t u_entry)
{
- rfs4_openowner_t *oo = (rfs4_openowner_t *)u_entry;
-
- if (rfs4_dbe_is_invalid(oo->ro_dbe))
- return (TRUE);
- return ((gethrestime_sec() - oo->ro_client->rc_last_access
- > rfs4_lease_time));
+ /* openstateid held us and did all needed delay */
+ return (TRUE);
}
static void