[ros-diffs] [sginsberg] 39094: - Missed fs_rec in last commit

[sginsberg at svn.reactos.org]

Author: sginsberg
Date: Sun Jan 25 10:21:14 2009
New Revision: 39094

URL: http://svn.reactos.org/svn/reactos?rev=39094&view=rev
Log:
- Missed fs_rec in last commit

Modified:
    trunk/reactos/drivers/filesystems/fs_rec/blockdev.c
    trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h

Modified: trunk/reactos/drivers/filesystems/fs_rec/blockdev.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/blockdev.c?rev=39094&r1=39093&r2=39094&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/fs_rec/blockdev.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fs_rec/blockdev.c [iso-8859-1] Sun Jan 25 10:21:14 2009
@@ -178,7 +178,7 @@
     {
         /* He didn't, allocate one */
         *Buffer = ExAllocatePoolWithTag(NonPagedPool,
-                                        PAGE_ROUND_UP(Length),
+                                        ROUND_TO_PAGES(Length),
                                         FSREC_TAG);
         if (!*Buffer) return FALSE;
     }

Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h?rev=39094&r1=39093&r2=39094&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Sun Jan 25 10:21:14 2009
@@ -13,11 +13,11 @@
 #include <ntifs.h>
 #include <ntdddisk.h>
 #include <ntddcdrm.h>
-#include "helper.h"
 
 //
 // Tag for memory allocations
 //
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
 #define FSREC_TAG TAG('F', 's', 'R', 'c')
 
 //
@@ -25,6 +25,15 @@
 //
 #define UDFS_VRS_START_OFFSET  32768
 #define UDFS_AVDP_SECTOR       256
+
+//
+// Non-standard rounding macros
+//
+#define ROUND_UP(n, align) \
+    ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
+
+#define ROUND_DOWN(n, align) \
+    (((ULONG)n) & ~((align) - 1l))
 
 //
 // Conversion types and macros taken from internal ntifs headers