d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up some cruft in the NFSv4 client left over from the

Browse Source 
OpenBSD port, so that it is more readable. No logic change
is made by this commit.

MFC after:	2 weeks
This commit is contained in:
rmacklem 2011-11-21 16:06:23 +00:00
parent c40e1792cb
commit 392edb56b8
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/fs/nfsclient/nfs_clstate.c
View File

@ -1681,7 +1681,6 @@ nfscl_cleanup_common(struct nfsclclient *clp, u_int8_t *own)
}
}
#if defined(APPLEKEXT) || defined(__FreeBSD__)
/*
* Find open/lock owners for processes that have exited.
*/
@ -1699,7 +1698,6 @@ nfscl_cleanupkext(struct nfsclclient *clp)
NFSUNLOCKCLSTATE();
NFSPROCLISTUNLOCK();
}
#endif /* APPLEKEXT || __FreeBSD__ */
static int fake_global; /* Used to force visibility of MNTK_UNMOUNTF */
/*
@ -2341,6 +2339,8 @@ nfscl_renewthread(struct nfsclclient *clp, NFSPROC_T *p)
u_int32_t clidrev;
int error, cbpathdown, islept, igotlock, ret, clearok;
uint32_t recover_done_time = 0;
struct timespec mytime;
static time_t prevsec = 0;
cred = newnfs_getcred();
NFSLOCKCLSTATE();
@ -2528,22 +2528,15 @@ nfscl_renewthread(struct nfsclclient *clp, NFSPROC_T *p)
FREE((caddr_t)dp, M_NFSCLDELEG);
}
#if defined(APPLEKEXT) || defined(__FreeBSD__)
/*
* Call nfscl_cleanupkext() once per second to check for
* open/lock owners where the process has exited.
*/
{
struct timespec mytime;
static time_t prevsec = 0;
NFSGETNANOTIME(&mytime);
if (prevsec != mytime.tv_sec) {
prevsec = mytime.tv_sec;
nfscl_cleanupkext(clp);
}
NFSGETNANOTIME(&mytime);
if (prevsec != mytime.tv_sec) {
prevsec = mytime.tv_sec;
nfscl_cleanupkext(clp);
}
#endif /* APPLEKEXT || __FreeBSD__ */
NFSLOCKCLSTATE();
if ((clp->nfsc_flags & NFSCLFLAGS_RECOVER) == 0)