From 7f5f903b0a7a15837a5d45423faee5428148de05 Mon Sep 17 00:00:00 2001 From: Olga Kornievskaia Date: Thu, 14 Apr 2011 20:14:21 -0400 Subject: [PATCH] [driver] [cosmetic] restructuring debugging output --- sys/nfs41_debug.c | 157 ++++++++++++++++++++++----------------------- sys/nfs41_debug.h | 1 + sys/nfs41_driver.c | 79 ++++++++++++----------- 3 files changed, 119 insertions(+), 118 deletions(-) diff --git a/sys/nfs41_debug.c b/sys/nfs41_debug.c index c452d4a..595b020 100644 --- a/sys/nfs41_debug.c +++ b/sys/nfs41_debug.c @@ -301,6 +301,13 @@ void print_file_object(int on, PFILE_OBJECT file) file->SharedRead, file->SharedWrite, file->SharedDelete, file->Flags); } +void print_fo_all(int on, PRX_CONTEXT c) +{ + if (!on) return; + DbgP("OpenCount %d FCB %p SRV %p FOBX %p\n", c->pFcb->OpenCount, c->pFcb, + c->pRelevantSrvOpen, c->pFobx); +} + VOID print_fcb(int on, IN PMRX_FCB p) { if (!on) return; @@ -370,61 +377,56 @@ VOID print_fobx(int on, IN PMRX_FOBX p) VOID print_irp_flags(int on, PIRP irp) { if (!on) return; - DbgP("RxContext->CurrentIrp %p\n", irp); - DbgP("IRP FLAGS:\n"); - if (irp->Flags & IRP_NOCACHE) - DbgP("\tIRP_NOCACHE\n"); - if (irp->Flags & IRP_PAGING_IO) - DbgP("\tIRP_PAGING_IO\n"); - if (irp->Flags & IRP_MOUNT_COMPLETION) - DbgP("\tIRP_MOUNT_COMPLETION\n"); - if (irp->Flags & IRP_SYNCHRONOUS_API) - DbgP("\tIRP_SYNCHRONOUS_API\n"); - if (irp->Flags & IRP_ASSOCIATED_IRP) - DbgP("\tIRP_ASSOCIATED_IRP\n"); - if (irp->Flags & IRP_BUFFERED_IO) - DbgP("\tIRP_BUFFERED_IO\n"); - if (irp->Flags & IRP_DEALLOCATE_BUFFER) - DbgP("\tIRP_DEALLOCATE_BUFFER\n"); - if (irp->Flags & IRP_INPUT_OPERATION) - DbgP("\tIRP_INPUT_OPERATION\n"); - if (irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) - DbgP("\tIRP_SYNCHRONOUS_PAGING_IO\n"); - if (irp->Flags & IRP_CREATE_OPERATION) - DbgP("\tIRP_CREATE_OPERATION\n"); - if (irp->Flags & IRP_READ_OPERATION) - DbgP("\tIRP_READ_OPERATION\n"); - if (irp->Flags & IRP_WRITE_OPERATION) - DbgP("\tIRP_WRITE_OPERATION\n"); - if (irp->Flags & IRP_CLOSE_OPERATION) - DbgP("\tIRP_CLOSE_OPERATION\n"); - if (irp->Flags & IRP_DEFER_IO_COMPLETION) - DbgP("\tIRP_DEFER_IO_COMPLETION\n"); + if (irp->Flags) + DbgP("IRP FLAGS: 0x%x %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", + irp->Flags, + (irp->Flags & IRP_NOCACHE)?"NOCACHE":"", + (irp->Flags & IRP_PAGING_IO)?"PAGING_IO":"", + (irp->Flags & IRP_MOUNT_COMPLETION)?"MOUNT":"", + (irp->Flags & IRP_SYNCHRONOUS_API)?"SYNC":"", + (irp->Flags & IRP_ASSOCIATED_IRP)?"ASSOC_IPR":"", + (irp->Flags & IRP_BUFFERED_IO)?"BUFFERED":"", + (irp->Flags & IRP_DEALLOCATE_BUFFER)?"DEALLOC_BUF":"", + (irp->Flags & IRP_INPUT_OPERATION)?"INPUT_OP":"", + (irp->Flags & IRP_SYNCHRONOUS_PAGING_IO)?"SYNC_PAGIN_IO":"", + (irp->Flags & IRP_CREATE_OPERATION)?"CREATE_OP":"", + (irp->Flags & IRP_READ_OPERATION)?"READ_OP":"", + (irp->Flags & IRP_WRITE_OPERATION)?"WRITE_OP":"", + (irp->Flags & IRP_CLOSE_OPERATION)?"CLOSE_OP":"", + (irp->Flags & IRP_DEFER_IO_COMPLETION)?"DEFER_IO":""); } void print_irps_flags(int on, PIO_STACK_LOCATION irps) { if (!on) return; - DbgP("RxContext->CurrentIrpSp %p\n", irps); - if(irps->Flags & SL_CASE_SENSITIVE) - DbgP("\tSL_CASE_SENSITIVE\n"); - if(irps->Flags & SL_OPEN_PAGING_FILE) - DbgP("\tSL_OPEN_PAGING_FILE\n"); - if(irps->Flags & SL_FORCE_ACCESS_CHECK) - DbgP("\tSL_FORCE_ACCESS_CHECK\n"); - if(irps->Flags & SL_OPEN_TARGET_DIRECTORY) - DbgP("\tSL_OPEN_TARGET_DIRECTORY\n"); + if (irps->Flags) + DbgP("IRPSP FLAGS 0x%x %s %s %s %s\n", irps->Flags, + (irps->Flags & SL_CASE_SENSITIVE)?"CASE_SENSITIVE":"", + (irps->Flags & SL_OPEN_PAGING_FILE)?"PAGING_FILE":"", + (irps->Flags & SL_FORCE_ACCESS_CHECK)?"ACCESS_CHECK":"", + (irps->Flags & SL_OPEN_TARGET_DIRECTORY)?"TARGET_DIR":""); } void print_nt_create_params(int on, NT_CREATE_PARAMETERS params) { if (!on) return; - DbgP("File attributes %ld: %s %s %s %s %s\n", params.FileAttributes, - (params.FileAttributes & FILE_ATTRIBUTE_TEMPORARY)?"TEMPFILE":"", - (params.FileAttributes & FILE_ATTRIBUTE_READONLY)?"READONLY":"", - (params.FileAttributes & FILE_ATTRIBUTE_HIDDEN)?"HIDDEN":"", - (params.FileAttributes & FILE_ATTRIBUTE_SYSTEM)?"SYSTEM":"", - (params.FileAttributes & FILE_ATTRIBUTE_ARCHIVE)?"ARCHIVE":""); - + if (params.FileAttributes) + DbgP("File attributes %x: %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", + params.FileAttributes, + (params.FileAttributes & FILE_ATTRIBUTE_TEMPORARY)?"TEMPFILE ":"", + (params.FileAttributes & FILE_ATTRIBUTE_READONLY)?"READONLY ":"", + (params.FileAttributes & FILE_ATTRIBUTE_HIDDEN)?"HIDDEN ":"", + (params.FileAttributes & FILE_ATTRIBUTE_SYSTEM)?"SYSTEM ":"", + (params.FileAttributes & FILE_ATTRIBUTE_ARCHIVE)?"ARCHIVE ":"", + (params.FileAttributes & FILE_ATTRIBUTE_DIRECTORY)?"DIR ":"", + (params.FileAttributes & FILE_ATTRIBUTE_DEVICE)?"DEVICE ":"", + (params.FileAttributes & FILE_ATTRIBUTE_NORMAL)?"NORMAL ":"", + (params.FileAttributes & FILE_ATTRIBUTE_SPARSE_FILE)?"SPARSE_FILE ":"", + (params.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)?"REPARSE_POINT ":"", + (params.FileAttributes & FILE_ATTRIBUTE_COMPRESSED)?"COMPRESSED ":"", + (params.FileAttributes & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED)?"NOT INDEXED ":"", + (params.FileAttributes & FILE_ATTRIBUTE_ENCRYPTED)?"ENCRYPTED ":"", + (params.FileAttributes & FILE_ATTRIBUTE_VIRTUAL)?"VIRTUAL":""); + if (params.Disposition == FILE_SUPERSEDE) DbgP("Create Dispositions: FILE_SUPERSEDE\n"); if (params.Disposition == FILE_CREATE) @@ -438,58 +440,49 @@ void print_nt_create_params(int on, NT_CREATE_PARAMETERS params) if (params.Disposition == FILE_OVERWRITE_IF) DbgP("Create Dispositions: FILE_OVERWRITE_IF\n"); - DbgP("Create Attributes: %s %s %s\n", + DbgP("Create Attributes: 0x%x %s %s %s %s %s %s %s %s %s %s %s %s %s %s " + "%s %s\n", params.CreateOptions, (params.CreateOptions & FILE_DIRECTORY_FILE)?"DIRFILE":"", (params.CreateOptions & FILE_NON_DIRECTORY_FILE)?"FILE":"", - (params.CreateOptions & FILE_DELETE_ON_CLOSE)?"DELETEONCLOSE":""); - if (on > 1) { - DbgP("More Create Attrss:\n"); - if (params.CreateOptions & FILE_WRITE_THROUGH) - DbgP("\tFILE_WRITE_THROUGH\n"); - if (params.CreateOptions & FILE_SEQUENTIAL_ONLY) - DbgP("\tFILE_SEQUENTIAL_ONLY\n"); - if (params.CreateOptions & FILE_RANDOM_ACCESS) - DbgP("\tFILE_RANDOM_ACCESS\n"); - if (params.CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) - DbgP("\tFILE_NO_INTERMEDIATE_BUFFERING\n"); - if (params.CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) - DbgP("\tFILE_SYNCHRONOUS_IO_ALERT\n"); - if (params.CreateOptions & FILE_SYNCHRONOUS_IO_NONALERT) - DbgP("\tFILE_SYNCHRONOUS_IO_NONALERT\n"); - if (params.CreateOptions & FILE_CREATE_TREE_CONNECTION) - DbgP("\tFILE_CREATE_TREE_CONNECTION\n"); - if (params.CreateOptions & FILE_COMPLETE_IF_OPLOCKED) - DbgP("\tFILE_COMPLETE_IF_OPLOCKED\n"); - if (params.CreateOptions & FILE_NO_EA_KNOWLEDGE) - DbgP("\tFILE_NO_EA_KNOWLEDGE\n"); - if (params.CreateOptions & FILE_OPEN_REPARSE_POINT) - DbgP("\tFILE_OPEN_REPARSE_POINT\n"); - if (params.CreateOptions & FILE_OPEN_BY_FILE_ID) - DbgP("\tFILE_OPEN_BY_FILE_ID\n"); - if (params.CreateOptions & FILE_OPEN_FOR_BACKUP_INTENT) - DbgP("\tFILE_OPEN_FOR_BACKUP_INTENT\n"); - if (params.CreateOptions & FILE_RESERVE_OPFILTER) - DbgP("\tFILE_RESERVE_OPFILTER \n"); - } + (params.CreateOptions & FILE_DELETE_ON_CLOSE)?"DELETE_ON_CLOSE":"", + (params.CreateOptions & FILE_WRITE_THROUGH)?"WRITE_THROUGH":"", + (params.CreateOptions & FILE_SEQUENTIAL_ONLY)?"SEQUENTIAL":"", + (params.CreateOptions & FILE_RANDOM_ACCESS)?"RANDOM":"", + (params.CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING)?"NO_BUFFERING":"", + (params.CreateOptions & FILE_SYNCHRONOUS_IO_ALERT)?"SYNC_ALERT":"", + (params.CreateOptions & FILE_SYNCHRONOUS_IO_NONALERT)?"SYNC_NOALERT":"", + (params.CreateOptions & FILE_CREATE_TREE_CONNECTION)?"CREATE_TREE_CONN":"", + (params.CreateOptions & FILE_COMPLETE_IF_OPLOCKED)?"OPLOCKED":"", + (params.CreateOptions & FILE_NO_EA_KNOWLEDGE)?"NO_EA":"", + (params.CreateOptions & FILE_OPEN_REPARSE_POINT)?"OPEN_REPARSE":"", + (params.CreateOptions & FILE_OPEN_BY_FILE_ID)?"BY_ID":"", + (params.CreateOptions & FILE_OPEN_FOR_BACKUP_INTENT)?"4_BACKUP":"", + (params.CreateOptions & FILE_RESERVE_OPFILTER)?"OPFILTER":""); DbgP("Share Access: %s %s %s\n", - (params.ShareAccess & FILE_SHARE_READ)?"READ ":"", - (params.ShareAccess & FILE_SHARE_WRITE)?"WRITE ":"", + (params.ShareAccess & FILE_SHARE_READ)?"READ":"", + (params.ShareAccess & FILE_SHARE_WRITE)?"WRITE":"", (params.ShareAccess & FILE_SHARE_DELETE)?"DELETE":""); - DbgP("Desired Access: %s %s %s %s %s %s %s %s %s %s %s %s\n", + DbgP("Desired Access: 0x%x %s %s %s %s %s %s %s %s %s %s %s\n", + params.DesiredAccess, (params.DesiredAccess & FILE_READ_DATA)?"READ":"", (params.DesiredAccess & STANDARD_RIGHTS_READ)?"READ_ACL":"", (params.DesiredAccess & FILE_READ_ATTRIBUTES)?"GETATTR":"", (params.DesiredAccess & FILE_READ_EA)?"READ_EA":"", (params.DesiredAccess & FILE_WRITE_DATA)?"WRITE":"", - (params.DesiredAccess & STANDARD_RIGHTS_WRITE)?"WRITE_ACL":"", (params.DesiredAccess & FILE_WRITE_ATTRIBUTES)?"SETATTR":"", (params.DesiredAccess & FILE_WRITE_EA)?"WRITE_EA":"", (params.DesiredAccess & FILE_APPEND_DATA)?"APPEND":"", (params.DesiredAccess & FILE_EXECUTE)?"EXEC":"", (params.DesiredAccess & FILE_LIST_DIRECTORY)?"LSDIR":"", - (params.DesiredAccess & FILE_TRAVERSE)?"TRAVERSE":""); + (params.DesiredAccess & FILE_TRAVERSE)?"TRAVERSE":"", + (params.DesiredAccess & FILE_LIST_DIRECTORY)?"LSDIR":"", + (params.DesiredAccess & DELETE)?"DELETE":"", + (params.DesiredAccess & READ_CONTROL)?"READ_CONTROL":"", + (params.DesiredAccess & WRITE_DAC)?"WRITE_DAC":"", + (params.DesiredAccess & WRITE_OWNER)?"WRITE_OWNER":"", + (params.DesiredAccess & SYNCHRONIZE)?"SYNCHRONIZE":""); } unsigned char * print_file_information_class(int InfoClass) diff --git a/sys/nfs41_debug.h b/sys/nfs41_debug.h index 1efe87a..cfdc96e 100644 --- a/sys/nfs41_debug.h +++ b/sys/nfs41_debug.h @@ -28,6 +28,7 @@ ULONG __cdecl DbgP(IN PCCH fmt, ...); ULONG __cdecl print_error(IN PCCH fmt, ...); +VOID print_fo_all(int on, IN PRX_CONTEXT c); VOID print_srv_call(int on, IN PMRX_SRV_CALL p); VOID print_net_root(int on, IN PMRX_NET_ROOT p); VOID print_v_net_root(int on, IN PMRX_V_NET_ROOT p); diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c index 7fff326..57b4abc 100644 --- a/sys/nfs41_driver.c +++ b/sys/nfs41_driver.c @@ -404,14 +404,18 @@ void print_debug_header(PRX_CONTEXT RxContext) print_file_object(0, IrpSp->FileObject); } else DbgP("Couldn't print FileObject IrpSp is NULL\n"); - print_fcb(1, RxContext->pFcb); - print_srv_open(1, RxContext->pRelevantSrvOpen); - print_fobx(1, RxContext->pFobx); + + print_fo_all(1, RxContext); if (RxContext->pFobx) { PNFS41_FOBX nfs41_fobx = (PNFS41_FOBX)(RxContext->pFobx)->Context; - DbgP("Session=0x%x OpenState=0x%x\n", pVNetRootContext->session, - nfs41_fobx->nfs41_open_state); + if (pVNetRootContext && nfs41_fobx) + DbgP("Session=0x%x OpenState=0x%x\n", pVNetRootContext->session, + nfs41_fobx->nfs41_open_state); } + if (RxContext->CurrentIrpSp) + print_irps_flags(1, RxContext->CurrentIrpSp); + if (RxContext->CurrentIrp) + print_irp_flags(1, RxContext->CurrentIrp); } /* convert strings from unicode -> ansi during marshalling to @@ -526,7 +530,7 @@ NTSTATUS marshal_nfs41_mount(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("server name=%wZ mount point=%wZ sec_flavor=%s\n", + DbgP("marshal_nfs41_mount: server name=%wZ mount point=%wZ sec_flavor=%s\n", entry->u.Mount.srv_name, entry->u.Mount.root, secflavorop2name(entry->u.Mount.sec_flavor)); out: @@ -547,7 +551,6 @@ NTSTATUS marshal_nfs41_unmount(nfs41_updowncall_entry *entry, if (status == STATUS_INSUFFICIENT_RESOURCES) goto out; - DbgP("session=0x%x\n", entry->session); out: DbgEx(); return status; @@ -594,11 +597,11 @@ NTSTATUS marshal_nfs41_open(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("mask=0x%x mode=0x%x attrs=0x%x opts=0x%x dispo=0x%x " - "open_owner_id=0x%x mode=%o\n", entry->u.Open.access_mask, - entry->u.Open.access_mode, entry->u.Open.attrs, - entry->u.Open.copts, entry->u.Open.disp, - entry->u.Open.open_owner_id, entry->u.Open.mode); + DbgP("marshal_nfs41_open: mask=0x%x mode=0x%x attrs=0x%x opts=0x%x " + "dispo=0x%x open_owner_id=0x%x mode=%o\n", entry->u.Open.access_mask, + entry->u.Open.access_mode, entry->u.Open.attrs, + entry->u.Open.copts, entry->u.Open.disp, + entry->u.Open.open_owner_id, entry->u.Open.mode); out: DbgEx(); return status; @@ -634,8 +637,6 @@ NTSTATUS marshal_nfs41_rw(nfs41_updowncall_entry *entry, entry->u.ReadWrite.buf = MmMapLockedPagesSpecifyCache(entry->u.ReadWrite.MdlAddress, UserMode, MmNonCached, NULL, TRUE, NormalPagePriority); - DbgP("MdlAddress=%p Userspace=%p\n", entry->u.ReadWrite.MdlAddress, - entry->u.ReadWrite.buf); if (entry->u.ReadWrite.buf == NULL) { print_error("MmMapLockedPagesSpecifyCache failed to map pages\n"); status = STATUS_INSUFFICIENT_RESOURCES; @@ -652,7 +653,9 @@ NTSTATUS marshal_nfs41_rw(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("len=%u offset=%lu\n", entry->u.ReadWrite.len, entry->u.ReadWrite.offset); + DbgP("marshal_nfs41_rw: len=%u offset=%lu MdlAddress=%p Userspace=%p\n", + entry->u.ReadWrite.len, entry->u.ReadWrite.offset, + entry->u.ReadWrite.MdlAddress, entry->u.ReadWrite.buf); out: DbgEx(); return status; @@ -690,9 +693,9 @@ NTSTATUS marshal_nfs41_lock(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("offset=%llx length=%llx exclusive=%u blocking=%u\n", - entry->u.Lock.offset, entry->u.Lock.length, - entry->u.Lock.exclusive, entry->u.Lock.blocking); + DbgP("marshal_nfs41_lock: offset=%llx length=%llx exclusive=%u " + "blocking=%u\n", entry->u.Lock.offset, entry->u.Lock.length, + entry->u.Lock.exclusive, entry->u.Lock.blocking); out: DbgEx(); return status; @@ -735,7 +738,7 @@ NTSTATUS marshal_nfs41_unlock(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("count=%u\n", entry->u.Unlock.count); + DbgP("marshal_nfs41_unlock: count=%u\n", entry->u.Unlock.count); out: DbgEx(); return status; @@ -778,8 +781,8 @@ NTSTATUS marshal_nfs41_close(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("remove=%d renamed=%d filename=%wZ\n", entry->u.Close.remove, - entry->u.Close.renamed, entry->u.Close.filename); + DbgP("marshal_nfs41_close: remove=%d renamed=%d filename=%wZ\n", + entry->u.Close.remove, entry->u.Close.renamed, entry->u.Close.filename); out: DbgEx(); return status; @@ -822,10 +825,10 @@ NTSTATUS marshal_nfs41_dirquery(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("filter='%wZ' class=%d\n\t1st\\restart\\single=%d\\%d\\%d\n", - entry->u.QueryFile.filter, entry->u.QueryFile.InfoClass, - entry->u.QueryFile.initial_query, entry->u.QueryFile.restart_scan, - entry->u.QueryFile.return_single); + DbgP("marshal_nfs41_dirquery: filter='%wZ'class=%d " + "1st\\restart\\single=%d\\%d\\%d\n", entry->u.QueryFile.filter, + entry->u.QueryFile.InfoClass, entry->u.QueryFile.initial_query, + entry->u.QueryFile.restart_scan, entry->u.QueryFile.return_single); out: DbgEx(); return status; @@ -861,7 +864,7 @@ NTSTATUS marshal_nfs41_filequery(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("class=%d\n", entry->u.QueryFile.InfoClass); + DbgP("marshal_nfs41_filequery: class=%d\n", entry->u.QueryFile.InfoClass); out: DbgEx(); return status; @@ -904,10 +907,10 @@ NTSTATUS marshal_nfs41_fileset(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("filename='%wZ' class=%d open_owner_id=0x%x access_mask=0x%x " - "access_mode=0x%x\n", entry->u.SetFile.filename, - entry->u.SetFile.InfoClass, entry->u.SetFile.open_owner_id, - entry->u.SetFile.access_mask, entry->u.SetFile.access_mode); + DbgP("marshal_nfs41_fileset: filename='%wZ' class=%d open_owner_id=0x%x " + "access_mask=0x%x access_mode=0x%x\n", entry->u.SetFile.filename, + entry->u.SetFile.InfoClass, entry->u.SetFile.open_owner_id, + entry->u.SetFile.access_mask, entry->u.SetFile.access_mode); print_hexbuf(0, (unsigned char *)"setfile buffer", entry->u.SetFile.buf, entry->u.SetFile.buf_len); out: @@ -940,7 +943,7 @@ NTSTATUS marshal_nfs41_easet(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("mode=0x%x\n", entry->u.SetEa.mode); + DbgP("marshal_nfs41_easet: mode=0x%x\n", entry->u.SetEa.mode); out: DbgEx(); return status; @@ -978,8 +981,9 @@ NTSTATUS marshal_nfs41_symlink(nfs41_updowncall_entry *entry, *len = header_len; - DbgP("symlink name %wZ symlink target %wZ\n", entry->u.Symlink.filename, - entry->u.Symlink.set?entry->u.Symlink.target : NULL); + DbgP("marshal_nfs41_symlink: name %wZ symlink target %wZ\n", + entry->u.Symlink.filename, + entry->u.Symlink.set?entry->u.Symlink.target : NULL); out: DbgEx(); return status; @@ -1009,7 +1013,7 @@ NTSTATUS marshal_nfs41_volume(nfs41_updowncall_entry *entry, RtlCopyMemory(tmp, &entry->u.Volume.query, sizeof(FS_INFORMATION_CLASS)); *len = header_len; - DbgP("query=0x%x\n", entry->u.Volume.query); + DbgP("marshal_nfs41_volume: class=%d\n", entry->u.Volume.query); out: DbgEx(); return status; @@ -1039,7 +1043,7 @@ NTSTATUS marshal_nfs41_getacl(nfs41_updowncall_entry *entry, RtlCopyMemory(tmp, &entry->u.Acl.query, sizeof(SECURITY_INFORMATION)); *len = header_len; - DbgP("query=%d\n", entry->u.Acl.query); + DbgP("marshal_nfs41_getacl: class=0x%x\n", entry->u.Acl.query); out: DbgEx(); return status; @@ -1074,7 +1078,8 @@ NTSTATUS marshal_nfs41_setacl(nfs41_updowncall_entry *entry, RtlCopyMemory(tmp, entry->u.Acl.buf, entry->u.Acl.buf_len); *len = header_len; - DbgP("query=%d sec_desc_len=%d\n", entry->u.Acl.query, entry->u.Acl.buf_len); + DbgP("marshal_nfs41_setacl: class=0x%x sec_desc_len=%d\n", + entry->u.Acl.query, entry->u.Acl.buf_len); out: DbgEx(); return status; @@ -4766,6 +4771,8 @@ NTSTATUS nfs41_FsCtl( DbgP("FSCTL_GET_REPARSE_POINT\n"); status = nfs41_GetReparsePoint(RxContext); break; + default: + DbgP("FsControlCode: %d\n", RxContext->LowIoContext.ParamsFor.FsCtl.FsControlCode); } DbgEx(); return status;