From ad60ddbca6259028a0e448f32f599ce4d2f73579 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Wed, 5 Jan 2005 01:42:23 +0000 Subject: [PATCH] Remove ROS-specific File Object Flags svn path=/trunk/; revision=12811 --- reactos/drivers/fs/cdfs/fcb.c | 6 +----- reactos/drivers/fs/cdfs/fsctl.c | 3 +-- reactos/drivers/fs/vfat/create.c | 1 - reactos/drivers/fs/vfat/fcb.c | 3 --- reactos/drivers/fs/vfat/fsctl.c | 3 +-- reactos/include/ddk/iotypes.h | 9 --------- reactos/ntoskrnl/io/rawfs.c | 3 +-- 7 files changed, 4 insertions(+), 24 deletions(-) diff --git a/reactos/drivers/fs/cdfs/fcb.c b/reactos/drivers/fs/cdfs/fcb.c index 487ad13107c..afb602b133b 100644 --- a/reactos/drivers/fs/cdfs/fcb.c +++ b/reactos/drivers/fs/cdfs/fcb.c @@ -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 @@ CdfsFCBInitializeCache(PVCB Vcb, 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 @@ CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb, } 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; diff --git a/reactos/drivers/fs/cdfs/fsctl.c b/reactos/drivers/fs/cdfs/fsctl.c index bb57b0ba470..5122ea7dde2 100644 --- a/reactos/drivers/fs/cdfs/fsctl.c +++ b/reactos/drivers/fs/cdfs/fsctl.c @@ -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 @@ CdfsMountVolume(PDEVICE_OBJECT DeviceObject, 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; diff --git a/reactos/drivers/fs/vfat/create.c b/reactos/drivers/fs/vfat/create.c index 7e7b3835d8c..3fe07dbc827 100644 --- a/reactos/drivers/fs/vfat/create.c +++ b/reactos/drivers/fs/vfat/create.c @@ -516,7 +516,6 @@ VfatCreateFile (PDEVICE_OBJECT DeviceObject, PIRP Irp) return (STATUS_INSUFFICIENT_RESOURCES); } RtlZeroMemory(pCcb, sizeof(VFATCCB)); - FileObject->Flags |= FO_FCB_IS_VALID; FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers; FileObject->FsContext = pFcb; FileObject->FsContext2 = pCcb; diff --git a/reactos/drivers/fs/vfat/fcb.c b/reactos/drivers/fs/vfat/fcb.c index a3687d48c9b..e45f4fbd522 100644 --- a/reactos/drivers/fs/vfat/fcb.c +++ b/reactos/drivers/fs/vfat/fcb.c @@ -330,7 +330,6 @@ vfatFCBInitializeCacheFromVolume (PVCB vcb, PVFATFCB fcb) } 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 @@ vfatAttachFCBToFileObject (PDEVICE_EXTENSION vcb, } 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; diff --git a/reactos/drivers/fs/vfat/fsctl.c b/reactos/drivers/fs/vfat/fsctl.c index c69197c4214..24a0f8942a1 100644 --- a/reactos/drivers/fs/vfat/fsctl.c +++ b/reactos/drivers/fs/vfat/fsctl.c @@ -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 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext) } 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; diff --git a/reactos/include/ddk/iotypes.h b/reactos/include/ddk/iotypes.h index 7f919780979..3af6fc71fdf 100644 --- a/reactos/include/ddk/iotypes.h +++ b/reactos/include/ddk/iotypes.h @@ -642,15 +642,6 @@ typedef struct _IO_COMPLETION_CONTEXT #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; diff --git a/reactos/ntoskrnl/io/rawfs.c b/reactos/ntoskrnl/io/rawfs.c index c2735c2d89b..ca9d7eb6175 100755 --- a/reactos/ntoskrnl/io/rawfs.c +++ b/reactos/ntoskrnl/io/rawfs.c @@ -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 @@ RawFsCreateFile(IN PRAWFS_IRP_CONTEXT IrpContext) return (STATUS_INSUFFICIENT_RESOURCES); } - FileObject->Flags |= FO_FCB_IS_VALID; FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers; FileObject->FsContext = pFcb; FileObject->FsContext2 = pCcb;