[ros-diffs] [ion] 12811: Remove ROS-specific File Object Flags

Remove ROS-specific File Object Flags
Modified: trunk/reactos/drivers/fs/cdfs/fcb.c
Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c
Modified: trunk/reactos/drivers/fs/vfat/create.c
Modified: trunk/reactos/drivers/fs/vfat/fcb.c
Modified: trunk/reactos/drivers/fs/vfat/fsctl.c
Modified: trunk/reactos/include/ddk/iotypes.h
Modified: trunk/reactos/ntoskrnl/io/rawfs.c
  _____  

Modified: trunk/reactos/drivers/fs/cdfs/fcb.c
--- trunk/reactos/drivers/fs/cdfs/fcb.c	2005-01-05 01:09:30 UTC (rev
12810)
+++ trunk/reactos/drivers/fs/cdfs/fcb.c	2005-01-05 01:42:23 UTC (rev
12811)
@@ -16,7 +16,7 @@

  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fcb.c,v 1.20 2004/11/06 13:41:58 ekohl Exp $
+/* $Id$
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -234,8 +234,6 @@
   RtlZeroMemory(newCCB,
 		sizeof(CCB));
 
-  FileObject->Flags = FileObject->Flags | FO_FCB_IS_VALID |
-      FO_DIRECT_CACHE_PAGING_READ;
   FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers;
   FileObject->FsContext = Fcb;
   FileObject->FsContext2 = newCCB;
@@ -423,8 +421,6 @@
     }
   memset(newCCB, 0, sizeof(CCB));
 
-  FileObject->Flags = FileObject->Flags | FO_FCB_IS_VALID |
-      FO_DIRECT_CACHE_PAGING_READ;
   FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers;
   FileObject->FsContext = Fcb;
   FileObject->FsContext2 = newCCB;
  _____  

Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c
--- trunk/reactos/drivers/fs/cdfs/fsctl.c	2005-01-05 01:09:30 UTC
(rev 12810)
+++ trunk/reactos/drivers/fs/cdfs/fsctl.c	2005-01-05 01:42:23 UTC
(rev 12811)
@@ -16,7 +16,7 @@

  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fsctl.c,v 1.20 2004/12/25 11:18:38 navaraf Exp $
+/* $Id$
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -385,7 +385,6 @@
   RtlZeroMemory(Ccb,
 		sizeof(CCB));
 
-  DeviceExt->StreamFileObject->Flags =
DeviceExt->StreamFileObject->Flags | FO_FCB_IS_VALID |
FO_DIRECT_CACHE_PAGING_READ;
   DeviceExt->StreamFileObject->FsContext = Fcb;
   DeviceExt->StreamFileObject->FsContext2 = Ccb;
   DeviceExt->StreamFileObject->SectionObjectPointer =
&Fcb->SectionObjectPointers;
  _____  

Modified: trunk/reactos/drivers/fs/vfat/create.c
--- trunk/reactos/drivers/fs/vfat/create.c	2005-01-05 01:09:30 UTC
(rev 12810)
+++ trunk/reactos/drivers/fs/vfat/create.c	2005-01-05 01:42:23 UTC
(rev 12811)
@@ -516,7 +516,6 @@

 	  return (STATUS_INSUFFICIENT_RESOURCES);
 	}
       RtlZeroMemory(pCcb, sizeof(VFATCCB));
-      FileObject->Flags |= FO_FCB_IS_VALID;
       FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers;
       FileObject->FsContext = pFcb;
       FileObject->FsContext2 = pCcb;
  _____  

Modified: trunk/reactos/drivers/fs/vfat/fcb.c
--- trunk/reactos/drivers/fs/vfat/fcb.c	2005-01-05 01:09:30 UTC (rev
12810)
+++ trunk/reactos/drivers/fs/vfat/fcb.c	2005-01-05 01:42:23 UTC (rev
12811)
@@ -330,7 +330,6 @@

   }
   RtlZeroMemory(newCCB, sizeof (VFATCCB));
 
-  fileObject->Flags |= FO_FCB_IS_VALID | FO_DIRECT_CACHE_PAGING_READ;
   fileObject->SectionObjectPointer = &fcb->SectionObjectPointers;
   fileObject->FsContext = fcb;
   fileObject->FsContext2 = newCCB;
@@ -535,8 +534,6 @@
   }
   RtlZeroMemory (newCCB, sizeof (VFATCCB));
 
-  fileObject->Flags = fileObject->Flags | FO_FCB_IS_VALID |
-      FO_DIRECT_CACHE_PAGING_READ;
   fileObject->SectionObjectPointer = &fcb->SectionObjectPointers;
   fileObject->FsContext = fcb;
   fileObject->FsContext2 = newCCB;
  _____  

Modified: trunk/reactos/drivers/fs/vfat/fsctl.c
--- trunk/reactos/drivers/fs/vfat/fsctl.c	2005-01-05 01:09:30 UTC
(rev 12810)
+++ trunk/reactos/drivers/fs/vfat/fsctl.c	2005-01-05 01:42:23 UTC
(rev 12811)
@@ -16,7 +16,7 @@

  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fsctl.c,v 1.37 2004/12/05 16:31:51 gvg Exp $
+/* $Id$
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -511,7 +511,6 @@
    }
 
    RtlZeroMemory(Ccb, sizeof (VFATCCB));
-   DeviceExt->FATFileObject->Flags = DeviceExt->FATFileObject->Flags |
FO_FCB_IS_VALID | FO_DIRECT_CACHE_PAGING_READ;
    DeviceExt->FATFileObject->FsContext = Fcb;
    DeviceExt->FATFileObject->FsContext2 = Ccb;
    DeviceExt->FATFileObject->SectionObjectPointer =
&Fcb->SectionObjectPointers;
  _____  

Modified: trunk/reactos/include/ddk/iotypes.h
--- trunk/reactos/include/ddk/iotypes.h	2005-01-05 01:09:30 UTC (rev
12810)
+++ trunk/reactos/include/ddk/iotypes.h	2005-01-05 01:42:23 UTC (rev
12811)
@@ -642,15 +642,6 @@

 #define FO_HANDLE_CREATED               0x00040000
 #define FO_FILE_FAST_IO_READ            0x00080000
 
-/*
- * ReactOS specific flags
- */
-#define FO_DIRECT_CACHE_READ            0x72000001
-#define FO_DIRECT_CACHE_WRITE           0x72000002
-#define FO_DIRECT_CACHE_PAGING_READ     0x72000004
-#define FO_DIRECT_CACHE_PAGING_WRITE    0x72000008
-#define FO_FCB_IS_VALID                 0x72000010
-
 typedef struct _FILE_OBJECT
 {
    CSHORT Type;
  _____  

Modified: trunk/reactos/ntoskrnl/io/rawfs.c
--- trunk/reactos/ntoskrnl/io/rawfs.c	2005-01-05 01:09:30 UTC (rev
12810)
+++ trunk/reactos/ntoskrnl/io/rawfs.c	2005-01-05 01:42:23 UTC (rev
12811)
@@ -1,4 +1,4 @@

-/* $Id: rawfs.c,v 1.13 2004/10/22 20:25:54 ekohl Exp $
+/* $Id$
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -454,7 +454,6 @@
       	  return (STATUS_INSUFFICIENT_RESOURCES);
       	}
 
-      FileObject->Flags |= FO_FCB_IS_VALID;
       FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers;
       FileObject->FsContext = pFcb;
       FileObject->FsContext2 = pCcb;