LU-1346 libcfs: cleanup libcfs primitive (linux-prim.h)

[fs/lustre-release.git] / lnet / selftest / winnt / selftest-winnt.c

diff --git a/lnet/selftest/winnt/selftest-winnt.c b/lnet/selftest/winnt/selftest-winnt.c
old mode 100755 (executable)
new mode 100644 (file)
index 5b3dee2..ce53045
--- a/lnet/selftest/winnt/selftest-winnt.c
+++ b/lnet/selftest/winnt/selftest-winnt.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=4:tabstop=4:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -217,11 +215,11 @@ ProcCreate(
     IN PIRP             Irp
     )
 {
-    NTSTATUS                    Status;
-    PIO_STACK_LOCATION          IrpSp;
+       NTSTATUS                        Status;
+       PIO_STACK_LOCATION              IrpSp;
 
-    FILE_FULL_EA_INFORMATION *  ea;
-    cfs_file_t *                fp;
+       FILE_FULL_EA_INFORMATION        *ea;
+       struct file                     *fp;
 
     IrpSp = IoGetCurrentIrpStackLocation(Irp);
     ea = (PFILE_FULL_EA_INFORMATION) Irp->AssociatedIrp.SystemBuffer;
@@ -251,12 +249,12 @@ ProcClose(
     IN PDEVICE_OBJECT   DeviceObject,
     IN PIRP             Irp)
 {
-    PIO_STACK_LOCATION          IrpSp;
+       PIO_STACK_LOCATION      IrpSp;
 
-    cfs_file_t *                fp;
+       struct file             *fp;
 
-    IrpSp = IoGetCurrentIrpStackLocation(Irp);
-    fp = (cfs_file_t *) IrpSp->FileObject->FsContext;
+       IrpSp = IoGetCurrentIrpStackLocation(Irp);
+       fp = (file_t *) IrpSp->FileObject->FsContext;
     ASSERT(fp != NULL);
     ASSERT(IrpSp->FileObject->FsContext2 == fp->private_data);
 
@@ -309,10 +307,10 @@ ProcDeviceControl(
 
         case IOCTL_LIBCFS_ENTRY:
         {
-            int rc = 0;
-            cfs_file_t * fp;
+                       int rc = 0;
+                       struct file *fp;
 
-            fp = (cfs_file_t *) IrpSp->FileObject->FsContext;
+                       fp = (struct file *)IrpSp->FileObject->FsContext;
 
             if (!fp) {
                 rc = -EINVAL;
@@ -336,12 +334,12 @@ ProcDeviceControl(
 NTSTATUS
 ProcReadWrite (PDEVICE_OBJECT DeviceObject, PIRP Irp)
 {
-    PIO_STACK_LOCATION  IrpSp;
-    NTSTATUS            Status;
+       PIO_STACK_LOCATION      IrpSp;
+       NTSTATUS                Status;
 
-    cfs_file_t *        fp;
-    int                 rc;
-    PCHAR               buf;
+       struct file             *fp;
+       int                     rc;
+       PCHAR                   buf;
 
     IrpSp = IoGetCurrentIrpStackLocation(Irp);
     if (Irp->MdlAddress) {
@@ -356,7 +354,7 @@ ProcReadWrite (PDEVICE_OBJECT DeviceObject, PIRP Irp)
         Status = STATUS_SUCCESS;
         rc = 0;
     } else {
-        fp = (cfs_file_t *) IrpSp->FileObject->FsContext;
+               fp = (struct file *)IrpSp->FileObject->FsContext;
 
         if (!fp) {
             Status = STATUS_INVALID_PARAMETER;