[Ocfs2-commits] mfasheh commits r802 - in trunk/src: . inc
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Mar 19 19:42:46 CST 2004
Author: mfasheh
Date: 2004-03-19 19:42:44 -0600 (Fri, 19 Mar 2004)
New Revision: 802
Modified:
trunk/src/dir.c
trunk/src/file.c
trunk/src/inc/journal.h
trunk/src/inc/ocfs.h
trunk/src/namei.c
trunk/src/osb.c
Log:
* Went on a cleanup rampage. The following fields are now gone:
osb->log_disk_off
osb->log_meta_disk_off
osb->log_file_size
osb->curr_trans_id
osb->metadata_map
osb->trans_in_progress
osb->data_prealloc
osb->md_prealloc
* Got rid of the unused ocfs_trans_in_progress macro
* removed some variables that were just being used as '0' and replaced
them with '0'
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-03-20 01:32:58 UTC (rev 801)
+++ trunk/src/dir.c 2004-03-20 01:42:44 UTC (rev 802)
@@ -352,7 +352,6 @@
}
ocfs_down_sem(&(osb->map_lock), true);
- ocfs_remove_extent_map_entry(osb, &osb->metadata_map, offset, 512);
ocfs_remove_extent_map_entry(osb, &osb->trans_map, offset, 512);
ocfs_up_sem(&(osb->map_lock));
sync_fe_write = true;
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-03-20 01:32:58 UTC (rev 801)
+++ trunk/src/file.c 2004-03-20 01:42:44 UTC (rev 802)
@@ -499,7 +499,6 @@
__u64 dirOffset = 0;
bool bAcquiredLock = false;
ocfs_lock_res *pLockResource = NULL;
- __u64 changeSeqNum = 0;
__u64 lockId = 0;
__u32 lockFlags = 0, locktype = 0;
bool bCacheLock = false;
@@ -509,8 +508,6 @@
LOG_ENTRY ();
- changeSeqNum = osb->curr_trans_id;
-
status = ocfs_read_bh (osb, file_off, &bh, OCFS_BH_CACHED, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -572,7 +569,7 @@
fileEntry->modify_time = OCFS_CURRENT_TIME;
- DISK_LOCK_SEQNUM (fileEntry) = changeSeqNum;
+ DISK_LOCK_SEQNUM (fileEntry) = 0;
OCFS_FE_SET_ATTRIBUTES(fileEntry, attr);
/* Set the valid bit here */
@@ -898,7 +895,6 @@
bool bFileLockAcquired = false;
bool bAcquiredLock = false;
ocfs_lock_res *pLockResource = NULL;
- __u64 changeSeqNum = 0;
bool bCacheLock = false;
__u64 new_alloc_size;
__u32 csize = osb->vol_layout.cluster_size;
@@ -909,8 +905,6 @@
LOG_ENTRY_ARGS ("(file_off = %u.%u, file_size = %u.%u\n",
HILO(file_off), HILO(file_size));
- changeSeqNum = osb->curr_trans_id;
-
new_alloc_size = OCFS_ALIGN(file_size, csize);
status = ocfs_read_bh (osb, file_off, &bh, OCFS_BH_CACHED, inode);
@@ -1023,7 +1017,7 @@
DISK_LOCK_CURRENT_MASTER (fe) = osb->node_num;
}
- DISK_LOCK_SEQNUM (fe) = changeSeqNum;
+ DISK_LOCK_SEQNUM (fe) = 0;
SET_VALID_BIT (fe->sync_flags);
fe->sync_flags &= ~(OCFS_SYNC_FLAG_CHANGE);
OcfsQuerySystemTime (&fe->modify_time);
@@ -1100,7 +1094,6 @@
bool bFileLockAcquired = false;
bool bAcquiredLock = false;
ocfs_lock_res *pLockResource = NULL;
- __u64 changeSeqNum = 0;
__u64 actualDiskOffset = 0;
__u64 actualLength = 0;
bool bCacheLock = false;
@@ -1110,8 +1103,6 @@
LOG_ENTRY ();
- changeSeqNum = osb->curr_trans_id;
-
if (file_size == 0)
goto leave;
@@ -1264,7 +1255,7 @@
}
/* no need to do OCFS_SECTOR_ALIGN once the allocation size is correct. */
- DISK_LOCK_SEQNUM (fileEntry) = changeSeqNum;
+ DISK_LOCK_SEQNUM (fileEntry) = 0;
}
/* Update tha file size and add the new one to old one. */
Modified: trunk/src/inc/journal.h
===================================================================
--- trunk/src/inc/journal.h 2004-03-20 01:32:58 UTC (rev 801)
+++ trunk/src/inc/journal.h 2004-03-20 01:42:44 UTC (rev 802)
@@ -340,12 +340,10 @@
#define ocfs_take_trans_lock(osb) \
do { \
down(&osb->trans_lock); \
- osb->trans_in_progress = true; \
} while (0)
#define ocfs_release_trans_lock(osb) \
do { \
- osb->trans_in_progress = false; \
up (&osb->trans_lock); \
} while (0)
Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h 2004-03-20 01:32:58 UTC (rev 801)
+++ trunk/src/inc/ocfs.h 2004-03-20 01:42:44 UTC (rev 802)
@@ -682,17 +682,6 @@
#define ocfs_task_interruptible(_o) ((_o)->dlm_task != current && signal_pending(current))
-#define ocfs_trans_in_progress(_o) \
-do { \
- int _i = 0; \
- while (((_o)->trans_in_progress) && (_i < 10)) {\
- ocfs_sleep (100); \
- _i++; \
- } \
-} while (0)
-
-
-
/*
** Macros
*/
@@ -2004,13 +1993,9 @@
bool reclaim_id; /* reclaim the original node number*/
__u8 hbm;
__u32 hbt;
- __u64 log_disk_off;
- __u64 log_meta_disk_off;
- __u64 log_file_size;
__u32 sect_size;
bool needs_flush;
ocfs_sem map_lock;
- ocfs_extent_map metadata_map;
ocfs_extent_map trans_map;
ocfs_alloc_bm cluster_bitmap;
@@ -2021,8 +2006,6 @@
#endif
__u32 max_dir_node_ent;
ocfs_vol_state vol_state;
- __s64 curr_trans_id;
- bool trans_in_progress;
struct semaphore recovery_lock;
spinlock_t recovery_map_lock;
__u32 recovery_map;
@@ -2039,8 +2022,6 @@
atomic_t nm_init;
wait_queue_head_t nm_init_event;
__u32 prealloc_lock;
- ocfs_io_runs *data_prealloc;
- ocfs_io_runs *md_prealloc;
// __u8 *cfg_prealloc;
struct buffer_head **cfg_bhs;
__u32 cfg_len;
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-03-20 01:32:58 UTC (rev 801)
+++ trunk/src/namei.c 2004-03-20 01:42:44 UTC (rev 802)
@@ -409,7 +409,7 @@
strcpy (fe->signature, OCFS_FILE_ENTRY_SIGNATURE);
SET_VALID_BIT (fe->sync_flags);
fe->sync_flags &= ~(OCFS_SYNC_FLAG_CHANGE);
- DISK_LOCK_SEQNUM (fe) = osb->curr_trans_id;
+ DISK_LOCK_SEQNUM (fe) = 0;
DISK_LOCK_CURRENT_MASTER (fe) = osb->node_num;
DISK_LOCK_FILE_LOCK (fe) = OCFS_DLM_ENABLE_CACHE_LOCK;
DISK_LOCK_READER_NODE (fe) = osb->node_num;
@@ -1496,7 +1496,6 @@
int status = 0;
ocfs_dir_node *pLockNode = NULL;
ocfs_file_entry *fe = NULL;
- __u64 changeSeqNum = 0;
__u32 lockFlags = 0;
__u64 lockId = 0;
__u32 index;
@@ -1571,7 +1570,7 @@
fe->filename[0] = '\0';
strncpy (fe->filename, file_name->name, file_name->len);
fe->filename[file_name->len] = '\0';
- DISK_LOCK_SEQNUM (fe) = changeSeqNum;
+ DISK_LOCK_SEQNUM (fe) = 0;
SET_VALID_BIT (fe->sync_flags);
fe->sync_flags &= ~(OCFS_SYNC_FLAG_CHANGE);
Modified: trunk/src/osb.c
===================================================================
--- trunk/src/osb.c 2004-03-20 01:32:58 UTC (rev 801)
+++ trunk/src/osb.c 2004-03-20 01:42:44 UTC (rev 802)
@@ -90,9 +90,6 @@
osb->needs_flush = false;
osb->disable_recovery = false;
- osb->log_disk_off = 0;
- osb->log_meta_disk_off = 0;
- osb->trans_in_progress = false;
init_MUTEX (&(osb->publish_lock));
atomic_set (&osb->node_req_vote, 0);
@@ -110,7 +107,6 @@
atomic_set (&osb->clean_buffer_seq, 1);
spin_lock_init (&osb->clean_buffer_lock);
- ocfs_extent_map_init (&osb->metadata_map);
ocfs_extent_map_init (&osb->trans_map);
INIT_LIST_HEAD (&(osb->cache_lock_list));
@@ -169,18 +165,7 @@
}
osb->prealloc_lock = 0;
- osb->data_prealloc = ocfs_malloc (IORUN_ALLOC_SIZE);
- if (!osb->data_prealloc) {
- LOG_ERROR_STATUS (status = -ENOMEM);
- goto bail;
- }
- osb->md_prealloc = ocfs_malloc (IORUN_ALLOC_SIZE);
- if (!osb->md_prealloc) {
- LOG_ERROR_STATUS (status = -ENOMEM);
- goto bail;
- }
-
osb->cfg_numblocks = OCFS_MAXIMUM_NODES + OCFS_VOLCFG_NEWCFG_SECTORS;
osb->cfg_len = osb->cfg_numblocks * sect_size;
osb->cfg_bhs = ocfs_malloc (osb->cfg_numblocks
@@ -260,8 +245,6 @@
bail:
if (osb->root_sect_node.buckets)
ocfs_hash_destroy (&(osb->root_sect_node), NULL);
- ocfs_safefree (osb->data_prealloc);
- ocfs_safefree (osb->md_prealloc);
ocfs_safefree (osb->cfg_bhs);
finally:
@@ -496,10 +479,7 @@
ocfs_del_sem (&(osb->osb_res));
ocfs_del_sem (&(osb->map_lock));
- ocfs_extent_map_destroy (&osb->metadata_map);
ocfs_extent_map_destroy (&osb->trans_map);
- ocfs_safefree(osb->data_prealloc);
- ocfs_safefree(osb->md_prealloc);
for(i = 0; i < osb->cfg_numblocks; i++)
if (osb->cfg_bhs[i])
brelse(osb->cfg_bhs[i]);
More information about the Ocfs2-commits
mailing list