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

Revert r220761 since, as kib@ pointed out, the case of

Browse Source 
adding the check to nfsrpc_close() isn't useful. Also,
the check in nfscl_getcl() must be more involved, since
it needs to check before and after the acquisition of
the refcnt on nfsc_lock, while the mutex that protects
the client state data is held.
This commit is contained in:
Rick Macklem 2011-04-18 23:35:16 +00:00
parent 74def44d38
commit a8bafa5d3b
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/fs/nfsclient/nfs_clrpcops.c
View File

@ -567,11 +567,6 @@ nfsrpc_close(vnode_t vp, int doclose, NFSPROC_T *p)
if (vnode_vtype(vp) != VREG)
return (0);
/* For forced unmounts, just return. */
if ((vp->v_mount->mnt_kern_flag & MNTK_UNMOUNTF) != 0)
return (0);
if (doclose)
error = nfscl_doclose(vp, &clp, p);
else

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

@ -692,10 +692,6 @@ nfscl_getcl(vnode_t vp, struct ucred *cred, NFSPROC_T *p,
int igotlock = 0, error, trystalecnt, clidinusedelay, i;
u_int16_t idlen = 0;
/* For forced unmounts, just return an error. */
if ((vnode_mount(vp)->mnt_kern_flag & MNTK_UNMOUNTF) != 0)
return (EPERM);
if (cred != NULL) {
getcredhostuuid(cred, uuid, sizeof uuid);
idlen = strlen(uuid);

4
sys/fs/nfsclient/nfs_clvfsops.c
View File

@ -1386,10 +1386,6 @@ nfs_sync(struct mount *mp, int waitfor)
td = curthread;
/* For a forced unmount, just return EPERM. */
if ((mp->mnt_kern_flag & MNTK_UNMOUNTF) != 0)
return (EPERM);
/*
* Force stale buffer cache information to be flushed.
*/