[Ocfs2-commits] jlbec commits r910 - in trunk/src: . inc
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon May 10 20:09:50 CDT 2004
Author: jlbec
Date: 2004-05-10 19:09:49 -0500 (Mon, 10 May 2004)
New Revision: 910
Modified:
trunk/src/alloc.c
trunk/src/dir.c
trunk/src/extmap.c
trunk/src/inc/ocfs.h
trunk/src/super.c
Log:
o Remove all .c references to OCFS_SECTOR_SIZE, except in the initial
ocfs_initialize_osb() call.
o Remove OCFS_{LOG,MOD}_SECTOR_SIZE, which is useless.
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-05-10 22:59:25 UTC (rev 909)
+++ trunk/src/alloc.c 2004-05-11 00:09:49 UTC (rev 910)
@@ -700,7 +700,7 @@
}
numSectorsAlloc = NUM_SECTORS_IN_LEAF_NODE + depth;
- allocSize = (numSectorsAlloc * OCFS_SECTOR_SIZE);
+ allocSize = (numSectorsAlloc * osb->sect_size);
/* allocate contiguous blocks on disk */
status = ocfs_alloc_node_block (osb, allocSize, &physicalOffset,
@@ -770,16 +770,16 @@
ext->last_ext_ptr = lastExtPointer;
ext->up_hdr_node_ptr = upHeaderPtr;
ext->next_free_ext = 1;
- ext->alloc_file_off = fileOffset + (OCFS_SECTOR_SIZE * i);
+ ext->alloc_file_off = fileOffset + (osb->sect_size * i);
ext->alloc_node = osb->node_num;
ext->extents[0].file_off = FileEntry->alloc_size;
ext->extents[0].num_bytes = actualLength;
- ext->this_ext = (__u64) (physicalOffset + (OCFS_SECTOR_SIZE * i));
+ ext->this_ext = (__u64) (physicalOffset + (osb->sect_size * i));
if (i != depth) {
/* fill in each header */
ext->type = OCFS_EXTENT_HEADER;
- ext->extents[0].disk_off = (__u64) (physicalOffset + (OCFS_SECTOR_SIZE * (i + 1)));
+ ext->extents[0].disk_off = (__u64) (physicalOffset + (osb->sect_size * (i + 1)));
ext->granularity = (depth - 1 - i);
strcpy (ext->signature, OCFS_EXTENT_HEADER_SIGNATURE);
} else {
@@ -916,7 +916,7 @@
OCFS_BH_PUT_DATA(fe_bh);
real_fe = NULL;
- AllocSize = ((fe->granularity + 2) * OCFS_SECTOR_SIZE);
+ AllocSize = ((fe->granularity + 2) * osb->sect_size);
numbhs = fe->granularity + 2;
bhs = ocfs_malloc(numbhs * sizeof(*bhs));
@@ -998,7 +998,7 @@
strcpy (ExtentHeader->signature, OCFS_EXTENT_HEADER_SIGNATURE);
if (i == 0) {
- ExtentHeader->extents[OCFS_MAX_FILE_ENTRY_EXTENTS].disk_off = physicalOffset + OCFS_SECTOR_SIZE;
+ ExtentHeader->extents[OCFS_MAX_FILE_ENTRY_EXTENTS].disk_off = physicalOffset + osb->sect_size;
ExtentHeader->extents[OCFS_MAX_FILE_ENTRY_EXTENTS].file_off = fe->alloc_size;
ExtentHeader->extents[OCFS_MAX_FILE_ENTRY_EXTENTS].num_bytes = length;
@@ -1010,13 +1010,13 @@
upHeaderPtr = ExtentHeader->this_ext;
lastExtentPtr = ExtentHeader->this_ext;
} else {
- ExtentHeader->extents[0].disk_off = physicalOffset + (OCFS_SECTOR_SIZE * (i + 1));
+ ExtentHeader->extents[0].disk_off = physicalOffset + (osb->sect_size * (i + 1));
ExtentHeader->extents[0].file_off = fe->alloc_size;
ExtentHeader->extents[0].num_bytes = length;
ExtentHeader->next_free_ext = 1;
- ExtentHeader->alloc_file_off = fileOffset + (OCFS_SECTOR_SIZE * i);
+ ExtentHeader->alloc_file_off = fileOffset + (osb->sect_size * i);
ExtentHeader->alloc_node = osb->node_num;
- ExtentHeader->this_ext = physicalOffset + (OCFS_SECTOR_SIZE * i);
+ ExtentHeader->this_ext = physicalOffset + (osb->sect_size * i);
ExtentHeader->up_hdr_node_ptr = upHeaderPtr;
ExtentHeader->last_ext_ptr = lastExtentPtr;
@@ -1045,9 +1045,9 @@
OcfsExtent->max_sects = NUM_SECTORS_IN_LEAF_NODE;
OcfsExtent->type = OCFS_EXTENT_DATA;
OcfsExtent->next_free_ext = i + 1;
- OcfsExtent->alloc_file_off = fileOffset + (fe->granularity * OCFS_SECTOR_SIZE);
+ OcfsExtent->alloc_file_off = fileOffset + (fe->granularity * osb->sect_size);
OcfsExtent->alloc_node = osb->node_num;
- OcfsExtent->this_ext = physicalOffset + (fe->granularity * OCFS_SECTOR_SIZE);
+ OcfsExtent->this_ext = physicalOffset + (fe->granularity * osb->sect_size);
OcfsExtent->up_hdr_node_ptr = upHeaderPtr;
OcfsExtent->last_ext_ptr = lastExtentPtr;
OcfsExtent->next_data_ext = 0;
@@ -2959,7 +2959,7 @@
OCFS_ASSERT (blockSize);
- lockId = (bm_file * OCFS_SECTOR_SIZE) + osb->vol_layout.root_int_off;
+ lockId = (bm_file * osb->sect_size) + osb->vol_layout.root_int_off;
inode = ocfs_iget(osb, lockId, lockId, NULL);
if (!inode) {
status = -EINVAL;
@@ -3155,15 +3155,12 @@
int status = 0;
struct buffer_head *dir_hdr_bh = NULL;
ocfs_dir_node *dirnode = NULL;
- __u32 size;
__u64 currentDirNode;
LOG_ENTRY ();
currentDirNode = fe->u.child_dirnode;
- size = OCFS_SECTOR_SIZE;
-
status = ocfs_read_bh(osb, currentDirNode, &dir_hdr_bh,
OCFS_BH_COND_CACHED, inode);
if (status < 0) {
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-05-10 22:59:25 UTC (rev 909)
+++ trunk/src/dir.c 2004-05-11 00:09:49 UTC (rev 910)
@@ -803,7 +803,7 @@
memcpy (lastEntry, InsertEntry, osb->sect_size);
OCFS_SET_FLAG (lastEntry->sync_flags, OCFS_SYNC_FLAG_VALID);
lastEntry->this_sector = InsertEntry->this_sector =
- DirNode->node_disk_off + ((freeOffset + 1) * OCFS_SECTOR_SIZE);
+ DirNode->node_disk_off + ((freeOffset + 1) * osb->sect_size);
OCFS_BH_PUT_DATA(bhs[freeOffset+1]);
status = ocfs_journal_dirty(handle, bhs[freeOffset+1]);
Modified: trunk/src/extmap.c
===================================================================
--- trunk/src/extmap.c 2004-05-10 22:59:25 UTC (rev 909)
+++ trunk/src/extmap.c 2004-05-11 00:09:49 UTC (rev 910)
@@ -446,11 +446,11 @@
if ((ByteCount) && (ByteCount != 0xFFFFFFFF)) {
ByteCount--;
- ByteCount >>= OCFS_LOG_SECTOR_SIZE;
+ ByteCount >>= osb->sect_size_bits;
ByteCount++;
}
- Vbo >>= OCFS_LOG_SECTOR_SIZE;
+ Vbo >>= osb->sect_size_bits;
ocfs_extent_map_remove ((ocfs_extent_map *) Map, (__s64) Vbo,
(__s64) ByteCount);
@@ -508,15 +508,15 @@
Results = ocfs_extent_map_next_entry (Map, RunIndex, Vbo, Lbo,
&LiSectorCount);
- (*Vbo) <<= OCFS_LOG_SECTOR_SIZE;
- (*Lbo) <<= OCFS_LOG_SECTOR_SIZE;
+ (*Vbo) <<= osb->sect_size_bits;
+ (*Lbo) <<= osb->sect_size_bits;
if (LiSectorCount > 0x00000000ffffffffLL) {
/* overflow */
Results = 0;
*SectorCount = 0xffffffffUL;
} else {
- *SectorCount = ((__u32)(LiSectorCount & 0xFFFFFFFFULL)) << OCFS_LOG_SECTOR_SIZE;
+ *SectorCount = ((__u32)(LiSectorCount & 0xFFFFFFFFULL)) << osb->sect_size_bits;
}
LOG_EXIT_INT (Results);
@@ -540,12 +540,12 @@
LOG_ENTRY ();
/* Sector Align the vbo */
- remainder = Vbo & OCFS_MOD_SECTOR_SIZE;
+ remainder = Vbo & (osb->sect_size - 1);
- ret = ocfs_extent_map_lookup (Map, (Vbo >> OCFS_LOG_SECTOR_SIZE), &LiLbo,
+ ret = ocfs_extent_map_lookup (Map, (Vbo >> osb->sect_size_bits), &LiLbo,
&LiSectorCount, Index);
if ((__u32) LiLbo != -1) {
- *Lbo = (((__s64) LiLbo) << (__s64) OCFS_LOG_SECTOR_SIZE);
+ *Lbo = (((__s64) LiLbo) << (__s64) osb->sect_size_bits);
if (ret) {
*Lbo += remainder;
}
@@ -556,7 +556,7 @@
*SectorCount = LiSectorCount;
if (*SectorCount) {
- *SectorCount <<= (__s64) OCFS_LOG_SECTOR_SIZE;
+ *SectorCount <<= (__s64) osb->sect_size_bits;
if (*SectorCount == 0) {
*SectorCount = (__u32) - 1;
}
@@ -675,7 +675,7 @@
if (ByteCount) {
/* Round up sectors */
ByteCount--;
- ByteCount >>= OCFS_LOG_SECTOR_SIZE;
+ ByteCount >>= osb->sect_size_bits;
ByteCount++;
}
Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h 2004-05-10 22:59:25 UTC (rev 909)
+++ trunk/src/inc/ocfs.h 2004-05-11 00:09:49 UTC (rev 910)
@@ -347,9 +347,9 @@
#define SECTOR_MASK (SECTOR_SIZE - 1)
-#define OCFS_LOG_SECTOR_SIZE 9
-#define OCFS_SECTOR_SIZE (1<<OCFS_LOG_SECTOR_SIZE)
-#define OCFS_MOD_SECTOR_SIZE (OCFS_SECTOR_SIZE - 1)
+/* FIXME: Left about for now */
+#define OCFS_SECTOR_SIZE 512
+
#define OCFS_MAXIMUM_NODES 32
#define OCFS_MAX_FILENAME_LENGTH 255
#define OCFS_MAX_OSB_ID 65536
Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c 2004-05-10 22:59:25 UTC (rev 909)
+++ trunk/src/super.c 2004-05-11 00:09:49 UTC (rev 910)
@@ -796,7 +796,7 @@
NULL, NULL);
OcfsGlobalCtxt.fe_cache = kmem_cache_create ("ocfs2_fileentry",
- OCFS_SECTOR_SIZE, 0, SLAB_NO_REAP | SLAB_HWCACHE_ALIGN, NULL, NULL);
+ 512, 0, SLAB_NO_REAP | SLAB_HWCACHE_ALIGN, NULL, NULL);
OcfsGlobalCtxt.extent_cache = kmem_cache_create ("ocfs2_extent",
sizeof(ocfs_extent) + OCFS_POINTER_SIZE, 0, SLAB_NO_REAP | SLAB_HWCACHE_ALIGN,
@@ -895,7 +895,7 @@
osb->reclaim_id = reclaim_id;
/* FIXME: here it should use the actual blocksize */
- sect_size = 512;
+ sect_size = OCFS_SECTOR_SIZE;
status = ocfs_initialize_osb (osb, vol_header, vol_label,
sect_size);
if (status < 0) {
More information about the Ocfs2-commits
mailing list