From 50dbd847f0c874fec917b4e54282d43f1d792f96 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 5 Nov 2010 15:36:10 -0400 Subject: [PATCH] driver: open files for one mount won't prevent unmount another IOCTL_NFS41_DELCONN had a check for RxDeviceObject->NumberOfActiveFcbs before calling nfs41_DeleteConnection(). this prevents us from unmounting even if the netroot has no open files, and is redundant because nfs41_FinalizeNetRoot() already has the necessary check for NetRoot->NumberOfFcbs/SrvOpens Signed-off-by: Casey Bodley --- sys/nfs41_driver.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c index 9cc6531..abbb16f 100644 --- a/sys/nfs41_driver.c +++ b/sys/nfs41_driver.c @@ -1790,7 +1790,7 @@ nfs41_DeleteConnection ( if (NodeType(VNetRoot) == RDBSS_NTC_V_NETROOT) { DbgP("Calling RxFinalizeConnection for NetRoot %p from VNetRoot %p\n", - VNetRoot->NetRoot, VNetRoot); + VNetRoot->NetRoot, VNetRoot); status = RxFinalizeConnection(VNetRoot->NetRoot, VNetRoot, TRUE); } else @@ -1837,12 +1837,6 @@ NTSTATUS nfs41_DevFcbXXXControlFile( status = nfs41_CreateConnection(RxContext, &RxContext->PostRequest); break; case IOCTL_NFS41_DELCONN: - if (RxContext->RxDeviceObject->NumberOfActiveFcbs > 0) { - DbgP("device has open handles %d\n", - RxContext->RxDeviceObject->NumberOfActiveFcbs); - status = STATUS_REDIRECTOR_HAS_OPEN_HANDLES; - break; - } status = nfs41_DeleteConnection(RxContext, &RxContext->PostRequest); break; case IOCTL_NFS41_GETSTATE: