[Ocfs2-commits] mfasheh commits r828 - in trunk/src: . inc
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Mar 31 16:40:24 CST 2004
Author: mfasheh
Date: 2004-03-31 16:40:22 -0600 (Wed, 31 Mar 2004)
New Revision: 828
Modified:
trunk/src/dir.c
trunk/src/inc/ocfs.h
trunk/src/inc/proto.h
trunk/src/osb.c
trunk/src/sysfile.c
Log:
* more cleanup. Remove:
osb->map_lock
osb->trans_map
ocfs_write_map_file (was mostly #if'd out, and not called from anywhere)
ocfs_create_log_extent_map (a leftover prototype)
OCFS_FILE_NUM_TO_SYSFILE_TYPE
OCFS_SYSFILE_TYPE_TO_FILE_NUM
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-03-31 22:09:59 UTC (rev 827)
+++ trunk/src/dir.c 2004-03-31 22:40:22 UTC (rev 828)
@@ -351,9 +351,6 @@
goto bail;
}
- ocfs_down_sem(&(osb->map_lock), true);
- ocfs_remove_extent_map_entry(osb, &osb->trans_map, offset, 512);
- ocfs_up_sem(&(osb->map_lock));
sync_fe_write = true;
OCFS_BH_PUT_DATA(bhs[idx+1]);
Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h 2004-03-31 22:09:59 UTC (rev 827)
+++ trunk/src/inc/ocfs.h 2004-03-31 22:40:22 UTC (rev 828)
@@ -650,20 +650,6 @@
(k) = ((k) >= 1) ? ((k) - 1) : (k); \
} while(0)
-#ifdef LOCAL_ALLOC
-#define OCFS_FILE_NUM_TO_SYSFILE_TYPE(num) ( (num >= 0 && num < OCFS_VOL_BITMAP_FILE + OCFS_MAXIMUM_NODES) ? \
- num/OCFS_MAXIMUM_NODES : OCFS_INVALID_SYSFILE )
-#define OCFS_SYSFILE_TYPE_TO_FILE_NUM(type,node) ( (type > OCFS_INVALID_SYSFILE && type <= OCFS_VOL_BM_SYSFILE && \
- node >=0 && node < OCFS_MAXIMUM_NODES) ? \
- (type * OCFS_MAXIMUM_NODES) + node : -1 )
-#else
-#define OCFS_FILE_NUM_TO_SYSFILE_TYPE(num) ( (num >= 0 && num < CLEANUP_FILE_BASE_ID + OCFS_MAXIMUM_NODES) ? \
- num/OCFS_MAXIMUM_NODES : OCFS_INVALID_SYSFILE )
-#define OCFS_SYSFILE_TYPE_TO_FILE_NUM(type,node) ( (type > OCFS_INVALID_SYSFILE && type <= CLEANUP_FILE_BASE_ID && \
- node >=0 && node < OCFS_MAXIMUM_NODES) ? \
- (type * OCFS_MAXIMUM_NODES) + node : -1 )
-#endif
-
#define down_with_flag(_sem, _flg) \
do { \
if (!_flg) { \
@@ -1992,8 +1978,6 @@
__u32 hbt;
__u32 sect_size;
bool needs_flush;
- ocfs_sem map_lock;
- ocfs_extent_map trans_map;
ocfs_alloc_bm cluster_bitmap;
#if 0
Modified: trunk/src/inc/proto.h
===================================================================
--- trunk/src/inc/proto.h 2004-03-31 22:09:59 UTC (rev 827)
+++ trunk/src/inc/proto.h 2004-03-31 22:40:22 UTC (rev 828)
@@ -53,12 +53,8 @@
int ocfs_break_cache_lock_zap_buffers(ocfs_super * osb, struct inode * inode);
int ocfs_send_readonly_drop_message(ocfs_super *osb, ocfs_lock_res *lockres, __u64 vote_map);
-
-int ocfs_create_log_extent_map (ocfs_super * osb, __u64 diskOffset, __u64 ByteCount);
-int ocfs_write_map_file (ocfs_super * osb);
int ocfs_extend_system_file (ocfs_super * osb, __u32 FileId, __u64 FileSize, struct buffer_head *fe_bh, ocfs_journal_handle *handle, bool zero);
-
void ocfs_extent_map_init (ocfs_extent_map * map);
void ocfs_extent_map_destroy (ocfs_extent_map * map);
void ocfs_delete_all_extent_maps (ocfs_inode * oin);
Modified: trunk/src/osb.c
===================================================================
--- trunk/src/osb.c 2004-03-31 22:09:59 UTC (rev 827)
+++ trunk/src/osb.c 2004-03-31 22:40:22 UTC (rev 828)
@@ -73,7 +73,6 @@
ocfs_init_sem (&(osb->osb_res));
- ocfs_init_sem (&(osb->map_lock));
ocfs_init_sem (&(osb->dir_alloc_lock));
ocfs_init_sem (&(osb->file_alloc_lock));
ocfs_init_sem (&(osb->vol_alloc_lock));
@@ -106,8 +105,6 @@
atomic_set (&osb->clean_buffer_seq, 1);
spin_lock_init (&osb->clean_buffer_lock);
- ocfs_extent_map_init (&osb->trans_map);
-
INIT_LIST_HEAD (&(osb->cache_lock_list));
INIT_LIST_HEAD (&(osb->needs_flush_head));
for (i=0; i<32; i++) {
@@ -477,8 +474,6 @@
ocfs_recover_oin_locks(osb, i);
ocfs_del_sem (&(osb->osb_res));
- ocfs_del_sem (&(osb->map_lock));
- ocfs_extent_map_destroy (&osb->trans_map);
for(i = 0; i < osb->cfg_numblocks; i++)
if (osb->cfg_bhs[i])
brelse(osb->cfg_bhs[i]);
Modified: trunk/src/sysfile.c
===================================================================
--- trunk/src/sysfile.c 2004-03-31 22:09:59 UTC (rev 827)
+++ trunk/src/sysfile.c 2004-03-31 22:40:22 UTC (rev 828)
@@ -856,120 +856,3 @@
return status;
} /* ocfs_find_extents_of_system_file */
-#ifndef USERSPACE_TOOL
-/*
- * ocfs_write_map_file()
- *
- */
-int ocfs_write_map_file (ocfs_super * osb)
-{
- int status = 0;
-/* function is mostly commented out as we may not be using it anymore. */
-#if 0
- __u32 RunsInMap;
- __u32 MapIndex;
- __u32 length;
- ocfs_offset_map *pMapBuffer = NULL;
- __u64 fileSize;
- __u64 allocSize;
- __u64 neededSize;
- __s64 foundVolOffset;
- __s64 foundlogOffset;
- __u32 numRec;
- ocfs_file_entry *fe = NULL;
-#endif
- LOG_ENTRY ();
-#if 0
- RunsInMap = osb->trans_map.count;
-
- LOG_TRACE_ARGS ("NumRuns in trans_map=%u\n", RunsInMap);
-
- if (RunsInMap == 0) {
- status = -EWARNING;
- goto leave;
- }
-
- neededSize =
- OCFS_ALIGN ((RunsInMap * sizeof (ocfs_offset_map)), osb->sect_size);
-
- status = ocfs_get_system_file_size (osb,
- (OCFS_FILE_VOL_META_DATA + osb->node_num),
- &fileSize, &allocSize);
- if (status < 0) {
- LOG_ERROR_STATUS (status);
- goto leave;
- }
-
- if (allocSize < neededSize) {
- LOG_TRACE_ARGS ("allocSize(%u.%u) < neededSize(%u.%u)",
- HILO (allocSize), HILO (neededSize));
- status = ocfs_extend_system_file (osb,
- (OCFS_FILE_VOL_META_DATA + osb->node_num),
- neededSize, NULL, NULL, false);
- if (status < 0) {
- LOG_ERROR_STATUS (status);
- goto leave;
- }
- }
-
- pMapBuffer = ocfs_malloc (neededSize);
- if (pMapBuffer == NULL) {
- LOG_ERROR_STATUS (status = -ENOMEM);
- goto leave;
- }
-
- numRec = 0;
- for (MapIndex = 0; MapIndex < RunsInMap; MapIndex++) {
- if (!ocfs_get_next_extent_map_entry (osb, &osb->trans_map, MapIndex,
- &foundVolOffset,
- &foundlogOffset, &length)) {
- /* It means this is a hole */
- continue;
- }
-
- pMapBuffer[numRec].length = length;
- pMapBuffer[numRec].actual_disk_off = foundVolOffset;
- pMapBuffer[numRec].log_disk_off = foundlogOffset;
- numRec++;
- }
-
- status = ocfs_force_get_file_entry (osb, &fe,
- ((OCFS_FILE_VOL_META_DATA +
- osb->node_num) * osb->sect_size) +
- osb->vol_layout.root_int_off, true);
- if (status < 0) {
- LOG_ERROR_STATUS (status);
- goto leave;
- }
-
- if (!IS_VALID_FILE_ENTRY (fe)) {
- LOG_ERROR_STATUS (status = -EINVAL);
- goto leave;
- }
-
-// status = ocfs_write_force_disk (osb, (void *) pMapBuffer, neededSize,
- osb->log_meta_disk_off);
- if (status < 0) {
- LOG_ERROR_STATUS (status);
- goto leave;
- }
-
- fe->file_size = (numRec * sizeof (ocfs_offset_map));
-
- status = ocfs_force_put_file_entry (osb, fe, true);
- if (status < 0) {
- LOG_ERROR_STATUS (status);
- goto leave;
- }
-
-leave:
- ocfs_release_file_entry (fe);
- ocfs_safefree (pMapBuffer);
-
-#endif
-
- LOG_EXIT_STATUS (status);
- return status;
-} /* ocfs_write_map_file */
-
-#endif /* ! USERSPACE_TOOL */
More information about the Ocfs2-commits
mailing list