From e2c36c0c2df925271737b8191f150daa158471da Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Mon, 21 Dec 2015 15:44:53 -0800 Subject: [PATCH] sys: fsctl, devctl: debug logs --- src/sys/devctl.c | 10 ++++++++-- src/sys/fsctl.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/sys/devctl.c b/src/sys/devctl.c index 56214417..8d76f32a 100644 --- a/src/sys/devctl.c +++ b/src/sys/devctl.c @@ -30,7 +30,10 @@ VOID FspFsvolDeviceControlComplete( { FSP_ENTER_IOC(PAGED_CODE()); - FSP_LEAVE_IOC("%s", ""); + FSP_LEAVE_IOC( + "%s, FileObject=%p", + IoctlCodeSym(IrpSp->Parameters.DeviceIoControl.IoControlCode), + IrpSp->FileObject); } NTSTATUS FspDeviceControl( @@ -46,5 +49,8 @@ NTSTATUS FspDeviceControl( FSP_RETURN(Result = STATUS_INVALID_DEVICE_REQUEST); } - FSP_LEAVE_MJ("%s", ""); + FSP_LEAVE_MJ( + "%s, FileObject=%p", + IoctlCodeSym(IrpSp->Parameters.DeviceIoControl.IoControlCode), + IrpSp->FileObject); } diff --git a/src/sys/fsctl.c b/src/sys/fsctl.c index 69b8cd59..fccb93f2 100644 --- a/src/sys/fsctl.c +++ b/src/sys/fsctl.c @@ -592,11 +592,11 @@ VOID FspFsvolFileSystemControlComplete( FSP_ENTER_IOC(PAGED_CODE()); FSP_LEAVE_IOC( - "FileObject=%p%s%s", - IrpSp->FileObject, - IRP_MN_USER_FS_REQUEST == IrpSp->MinorFunction ? ", " : "", + "%s%sFileObject=%p", IRP_MN_USER_FS_REQUEST == IrpSp->MinorFunction ? - IoctlCodeSym(IrpSp->Parameters.FileSystemControl.FsControlCode) : ""); + IoctlCodeSym(IrpSp->Parameters.FileSystemControl.FsControlCode) : "", + IRP_MN_USER_FS_REQUEST == IrpSp->MinorFunction ? ", " : "", + IrpSp->FileObject); } NTSTATUS FspFileSystemControl( @@ -615,9 +615,9 @@ NTSTATUS FspFileSystemControl( } FSP_LEAVE_MJ( - "FileObject=%p%s%s", - IrpSp->FileObject, - IRP_MN_USER_FS_REQUEST == IrpSp->MinorFunction ? ", " : "", + "%s%sFileObject=%p", IRP_MN_USER_FS_REQUEST == IrpSp->MinorFunction ? - IoctlCodeSym(IrpSp->Parameters.FileSystemControl.FsControlCode) : ""); + IoctlCodeSym(IrpSp->Parameters.FileSystemControl.FsControlCode) : "", + IRP_MN_USER_FS_REQUEST == IrpSp->MinorFunction ? ", " : "", + IrpSp->FileObject); }