Merge branch 'master' of http://github.com/openzfsonwindows/ZFSin

openzfsonwindows · Jun 13, 2018 · 8ffa9aa · 8ffa9aa
2 parents 0e8eb5b + 47337b5
commit 8ffa9aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/ZFSin/spl/include/sys/vnode.h b/ZFSin/spl/include/sys/vnode.h
@@ -418,10 +418,12 @@ static inline int win_has_cached_data(struct vnode *vp)
 			vp->FileHeader.AllocationSize.QuadPart = P2ROUNDUP((sz), PAGE_SIZE); \
 			vp->FileHeader.FileSize.QuadPart = (sz); \
 			vp->FileHeader.ValidDataLength.QuadPart = (sz); \
-			ccfs.AllocationSize = vp->FileHeader.AllocationSize; \
-			ccfs.FileSize = vp->FileHeader.FileSize; \
-			ccfs.ValidDataLength = vp->FileHeader.ValidDataLength; \
-			CcSetFileSizes(fileObject, &ccfs); \
+			if (CcIsFileCached(fileObject)) { \
+				ccfs.AllocationSize = vp->FileHeader.AllocationSize; \
+				ccfs.FileSize = vp->FileHeader.FileSize; \
+				ccfs.ValidDataLength = vp->FileHeader.ValidDataLength; \
+				CcSetFileSizes(fileObject, &ccfs); \
+			} \
 			ObDereferenceObject(fileObject); \
 		} \
 	} while(0)

diff --git a/ZFSin/zfs/module/zfs/zfs_vnops_windows.c b/ZFSin/zfs/module/zfs/zfs_vnops_windows.c
@@ -1785,11 +1785,8 @@ NTSTATUS query_volume_information(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STA
 		RtlCopyMemory(ffai->FileSystemName, name.Buffer, space);
 		Irp->IoStatus.Information = FIELD_OFFSET(FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName) + space;
 
+		Status = STATUS_SUCCESS;
 
-		if (space < zmo->name.Length)
-			Status = STATUS_BUFFER_OVERFLOW;
-		else
-			Status = STATUS_SUCCESS;
 		ASSERT(Irp->IoStatus.Information <= IrpSp->Parameters.QueryVolume.Length);
 		break;
 	case FileFsControlInformation: