Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 05:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove ROS-specific File Object Flags

Browse source 
svn path=/trunk/; revision=12811
This commit is contained in:
Alex Ionescu 2005-01-05 01:42:23 +00:00
parent 2b9f762918
commit ad60ddbca6
7 changed files with 4 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/drivers/fs/cdfs/fcb.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -234,8 +234,6 @@ CdfsFCBInitializeCache(PVCB Vcb,
RtlZeroMemory(newCCB, RtlZeroMemory(newCCB,
sizeof(CCB)); sizeof(CCB));
FileObject->Flags = FileObject->Flags | FO_FCB_IS_VALID |
FO_DIRECT_CACHE_PAGING_READ;
FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers;
FileObject->FsContext = Fcb; FileObject->FsContext = Fcb;
FileObject->FsContext2 = newCCB; FileObject->FsContext2 = newCCB;
@ -423,8 +421,6 @@ CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb,
} }
memset(newCCB, 0, sizeof(CCB)); memset(newCCB, 0, sizeof(CCB));
FileObject->Flags = FileObject->Flags | FO_FCB_IS_VALID |
FO_DIRECT_CACHE_PAGING_READ;
FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers;
FileObject->FsContext = Fcb; FileObject->FsContext = Fcb;
FileObject->FsContext2 = newCCB; FileObject->FsContext2 = newCCB;

3
reactos/drivers/fs/cdfs/fsctl.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -385,7 +385,6 @@ CdfsMountVolume(PDEVICE_OBJECT DeviceObject,
RtlZeroMemory(Ccb, RtlZeroMemory(Ccb,
sizeof(CCB)); sizeof(CCB));
DeviceExt->StreamFileObject->Flags = DeviceExt->StreamFileObject->Flags | FO_FCB_IS_VALID | FO_DIRECT_CACHE_PAGING_READ;
DeviceExt->StreamFileObject->FsContext = Fcb; DeviceExt->StreamFileObject->FsContext = Fcb;
DeviceExt->StreamFileObject->FsContext2 = Ccb; DeviceExt->StreamFileObject->FsContext2 = Ccb;
DeviceExt->StreamFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; DeviceExt->StreamFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers;

1
reactos/drivers/fs/vfat/create.c
View file

@ -516,7 +516,6 @@ VfatCreateFile (PDEVICE_OBJECT DeviceObject, PIRP Irp)
return (STATUS_INSUFFICIENT_RESOURCES); return (STATUS_INSUFFICIENT_RESOURCES);
} }
RtlZeroMemory(pCcb, sizeof(VFATCCB)); RtlZeroMemory(pCcb, sizeof(VFATCCB));
FileObject->Flags |= FO_FCB_IS_VALID;
FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers; FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers;
FileObject->FsContext = pFcb; FileObject->FsContext = pFcb;
FileObject->FsContext2 = pCcb; FileObject->FsContext2 = pCcb;

3
reactos/drivers/fs/vfat/fcb.c
View file

@ -330,7 +330,6 @@ vfatFCBInitializeCacheFromVolume (PVCB vcb, PVFATFCB fcb)
} }
RtlZeroMemory(newCCB, sizeof (VFATCCB)); RtlZeroMemory(newCCB, sizeof (VFATCCB));
fileObject->Flags |= FO_FCB_IS_VALID | FO_DIRECT_CACHE_PAGING_READ;
fileObject->SectionObjectPointer = &fcb->SectionObjectPointers; fileObject->SectionObjectPointer = &fcb->SectionObjectPointers;
fileObject->FsContext = fcb; fileObject->FsContext = fcb;
fileObject->FsContext2 = newCCB; fileObject->FsContext2 = newCCB;
@ -535,8 +534,6 @@ vfatAttachFCBToFileObject (PDEVICE_EXTENSION vcb,
} }
RtlZeroMemory (newCCB, sizeof (VFATCCB)); RtlZeroMemory (newCCB, sizeof (VFATCCB));
fileObject->Flags = fileObject->Flags | FO_FCB_IS_VALID |
FO_DIRECT_CACHE_PAGING_READ;
fileObject->SectionObjectPointer = &fcb->SectionObjectPointers; fileObject->SectionObjectPointer = &fcb->SectionObjectPointers;
fileObject->FsContext = fcb; fileObject->FsContext = fcb;
fileObject->FsContext2 = newCCB; fileObject->FsContext2 = newCCB;

3
reactos/drivers/fs/vfat/fsctl.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -511,7 +511,6 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext)
} }
RtlZeroMemory(Ccb, sizeof (VFATCCB)); 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->FsContext = Fcb;
DeviceExt->FATFileObject->FsContext2 = Ccb; DeviceExt->FATFileObject->FsContext2 = Ccb;
DeviceExt->FATFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; DeviceExt->FATFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers;

9
reactos/include/ddk/iotypes.h
View file

@ -642,15 +642,6 @@ typedef struct _IO_COMPLETION_CONTEXT
#define FO_HANDLE_CREATED 0x00040000 #define FO_HANDLE_CREATED 0x00040000
#define FO_FILE_FAST_IO_READ 0x00080000 #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 typedef struct _FILE_OBJECT
{ {
CSHORT Type; CSHORT Type;

3
reactos/ntoskrnl/io/rawfs.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -454,7 +454,6 @@ RawFsCreateFile(IN PRAWFS_IRP_CONTEXT IrpContext)
return (STATUS_INSUFFICIENT_RESOURCES); return (STATUS_INSUFFICIENT_RESOURCES);
} }
FileObject->Flags |= FO_FCB_IS_VALID;
FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers; FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers;
FileObject->FsContext = pFcb; FileObject->FsContext = pFcb;
FileObject->FsContext2 = pCcb; FileObject->FsContext2 = pCcb;