[Ocfs2-commits] jlbec commits r1051 - branches/format-changes/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Jun 11 05:42:11 CDT 2004
Author: jlbec
Date: 2004-06-11 04:42:10 -0500 (Fri, 11 Jun 2004)
New Revision: 1051
Modified:
branches/format-changes/src/dlm.c
branches/format-changes/src/dlm.h
branches/format-changes/src/file.c
branches/format-changes/src/inode.c
branches/format-changes/src/lockres.c
branches/format-changes/src/namei.c
branches/format-changes/src/nm.c
branches/format-changes/src/ocfs.h
branches/format-changes/src/sysfile.c
branches/format-changes/src/volcfg.c
Log:
o Rename to ocfs2_disk_lock
o Make all field names dl_<something>.
Modified: branches/format-changes/src/dlm.c
===================================================================
--- branches/format-changes/src/dlm.c 2004-06-11 01:42:56 UTC (rev 1050)
+++ branches/format-changes/src/dlm.c 2004-06-11 09:42:10 UTC (rev 1051)
@@ -80,15 +80,19 @@
ocfs_node_map_set_from_disk(vote_map, publish->reserved1);
}
-void ocfs_set_disk_lock_open_map(ocfs_super *osb, ocfs_disk_lock *lock, ocfs_node_map *open_map)
+void ocfs_set_disk_lock_open_map(ocfs_super *osb,
+ ocfs2_disk_lock *lock,
+ ocfs_node_map *open_map)
{
- ocfs_node_map_set_to_disk(lock->oin_node_map, open_map);
+ ocfs_node_map_set_to_disk(lock->dl_node_map, open_map);
}
-void ocfs_get_disk_lock_open_map(ocfs_super *osb, ocfs_disk_lock *lock, ocfs_node_map *open_map)
+void ocfs_get_disk_lock_open_map(ocfs_super *osb,
+ ocfs2_disk_lock *lock,
+ ocfs_node_map *open_map)
{
ocfs_node_map_init(osb, open_map);
- ocfs_node_map_set_from_disk(open_map, lock->oin_node_map);
+ ocfs_node_map_set_from_disk(open_map, lock->dl_node_map);
}
@@ -244,8 +248,8 @@
goto finally;
}
fe = OCFS_BH_GET_DATA_READ(bh);
- curr_master = DISK_LOCK(fe)->curr_master;
- lock_level = DISK_LOCK(fe)->file_lock;
+ curr_master = DISK_LOCK(fe)->dl_master;
+ lock_level = DISK_LOCK(fe)->dl_level;
OCFS_BH_PUT_DATA(bh);
if ((curr_master == OCFS_INVALID_NODE_NUM) ||
@@ -258,8 +262,8 @@
/* Reset the lock as not owned and return success?? */
/* This needs to be under some sort of cluster wide lock, */
fe = OCFS_BH_GET_DATA_WRITE(bh);
- DISK_LOCK(fe)->curr_master = OCFS_INVALID_NODE_NUM;
- DISK_LOCK(fe)->file_lock = OCFS_DLM_NO_LOCK;
+ DISK_LOCK(fe)->dl_master = OCFS_INVALID_NODE_NUM;
+ DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(bh);
tmpstat = ocfs_write_bh (osb, bh, 0, NULL);
if (tmpstat < 0) {
@@ -337,7 +341,7 @@
}
LOG_TRACE_ARGS("broke cache lock, setting to NO_LOCK\n");
fe = OCFS_BH_GET_DATA_WRITE(bh);
- DISK_LOCK(fe)->file_lock = OCFS_DLM_NO_LOCK;
+ DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
lock_level = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(bh);
tmpstat = ocfs_write_bh (osb, bh, 0, inode);
@@ -599,23 +603,23 @@
fe = OCFS_BH_GET_DATA_READ(*bh);
if (flags & DLOCK_FLAG_MASTER &&
- DISK_LOCK(fe)->curr_master != lockres->master_node_num) {
+ DISK_LOCK(fe)->dl_master != lockres->master_node_num) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
- DISK_LOCK(fe)->curr_master = lockres->master_node_num;
+ DISK_LOCK(fe)->dl_master = lockres->master_node_num;
}
if (flags & DLOCK_FLAG_LOCK &&
- DISK_LOCK(fe)->file_lock != lockres->lock_type) {
+ DISK_LOCK(fe)->dl_level != lockres->lock_type) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
- DISK_LOCK(fe)->file_lock = lockres->lock_type;
+ DISK_LOCK(fe)->dl_level = lockres->lock_type;
}
if (flags & DLOCK_FLAG_OPEN_MAP) {
@@ -638,13 +642,13 @@
}
if (flags & DLOCK_FLAG_SEQ_NUM &&
- DISK_LOCK(fe)->dlock_seq_num != lockres->last_upd_seq_num) {
+ DISK_LOCK(fe)->dl_seq_num != lockres->last_upd_seq_num) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
- DISK_LOCK(fe)->dlock_seq_num = lockres->last_upd_seq_num;
+ DISK_LOCK(fe)->dl_seq_num = lockres->last_upd_seq_num;
}
OCFS_BH_PUT_DATA(*bh);
@@ -825,9 +829,9 @@
BUG();
if (lockres->master_node_num != osb->node_num ||
- lockres->master_node_num != DISK_LOCK(disklock)->curr_master) {
- lockres->master_node_num = DISK_LOCK(disklock)->curr_master;
- lockres->lock_type = DISK_LOCK(disklock)->file_lock;
+ lockres->master_node_num != DISK_LOCK(disklock)->dl_master) {
+ lockres->master_node_num = DISK_LOCK(disklock)->dl_master;
+ lockres->lock_type = DISK_LOCK(disklock)->dl_level;
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(disklock),
&lockres->oin_openmap);
}
@@ -1040,7 +1044,7 @@
ocfs_node_map_init(osb, &openmap);
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe), &openmap);
#endif
- curr_master = DISK_LOCK(fe)->curr_master;
+ curr_master = DISK_LOCK(fe)->dl_master;
OCFS_BH_PUT_DATA(*b);
if (!IS_VALID_NODE_NUM (curr_master)) {
@@ -1126,20 +1130,20 @@
LOG_TRACE_ARGS("writing lock now... releasemaster: %s, level: %d, master: %d\n",
flags & FLAG_FILE_RELEASE_MASTER ? "yes" : "no",
- DISK_LOCK(fe)->file_lock,
- DISK_LOCK(fe)->curr_master);
+ DISK_LOCK(fe)->dl_level,
+ DISK_LOCK(fe)->dl_master);
if (flags & FLAG_FILE_RELEASE_MASTER)
- DISK_LOCK(fe)->curr_master = OCFS_INVALID_NODE_NUM;
+ DISK_LOCK(fe)->dl_master = OCFS_INVALID_NODE_NUM;
- if ((DISK_LOCK(fe)->file_lock == OCFS_DLM_ENABLE_CACHE_LOCK) &&
- (DISK_LOCK(fe)->curr_master == osb->node_num)) {
+ if ((DISK_LOCK(fe)->dl_level == OCFS_DLM_ENABLE_CACHE_LOCK) &&
+ (DISK_LOCK(fe)->dl_master == osb->node_num)) {
lockres->lock_type = OCFS_DLM_ENABLE_CACHE_LOCK;
cachelock = 1;
LOG_TRACE_STR("keeping at CACHE_LOCK");
}
else {
LOG_TRACE_STR("setting to NO_LOCK");
- DISK_LOCK(fe)->file_lock = OCFS_DLM_NO_LOCK;
+ DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
}
OCFS_BH_PUT_DATA(*b);
@@ -1309,8 +1313,8 @@
if (bh) {
fe = OCFS_BH_GET_DATA_READ(bh);
/* may not need to rewrite the lock later if we already have a cachelock */
- need_lock_write = (DISK_LOCK(fe)->curr_master != osb->node_num ||
- DISK_LOCK(fe)->file_lock != OCFS_DLM_ENABLE_CACHE_LOCK);
+ need_lock_write = (DISK_LOCK(fe)->dl_master != osb->node_num ||
+ DISK_LOCK(fe)->dl_level != OCFS_DLM_ENABLE_CACHE_LOCK);
OCFS_BH_PUT_DATA(bh);
} else
need_lock_write = 0;
Modified: branches/format-changes/src/dlm.h
===================================================================
--- branches/format-changes/src/dlm.h 2004-06-11 01:42:56 UTC (rev 1050)
+++ branches/format-changes/src/dlm.h 2004-06-11 09:42:10 UTC (rev 1051)
@@ -48,9 +48,13 @@
int ocfs_wait_for_lock_release(ocfs_super *osb, __u64 offset,
__u32 time_to_wait, __u32 lock_type,
struct inode *inode);
-void ocfs_set_publish_vote_map(ocfs_super *osb, ocfs_publish *publish, ocfs_node_map *vote_map);
-void ocfs_get_publish_vote_map(ocfs_super *osb, ocfs_publish *publish, ocfs_node_map *vote_map);
-void ocfs_set_disk_lock_open_map(ocfs_super *osb, ocfs_disk_lock *lock, ocfs_node_map *open_map);
-void ocfs_get_disk_lock_open_map(ocfs_super *osb, ocfs_disk_lock *lock, ocfs_node_map *open_map);
+void ocfs_set_publish_vote_map(ocfs_super *osb, ocfs_publish *publish,
+ ocfs_node_map *vote_map);
+void ocfs_get_publish_vote_map(ocfs_super *osb, ocfs_publish *publish,
+ ocfs_node_map *vote_map);
+void ocfs_set_disk_lock_open_map(ocfs_super *osb, ocfs2_disk_lock *lock,
+ ocfs_node_map *open_map);
+void ocfs_get_disk_lock_open_map(ocfs_super *osb, ocfs2_disk_lock *lock,
+ ocfs_node_map *open_map);
#endif /* OCFS2_DLM_H */
Modified: branches/format-changes/src/file.c
===================================================================
--- branches/format-changes/src/file.c 2004-06-11 01:42:56 UTC (rev 1050)
+++ branches/format-changes/src/file.c 2004-06-11 09:42:10 UTC (rev 1051)
@@ -119,7 +119,7 @@
/* why do we update these here? */
OCFS_I(inode)->alloc_size =
(u64)fe->i_clusters << osb->s_clustersize_bits;
- OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dlock_seq_num;
+ OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dl_seq_num;
if (fe->i_blkno == 0)
LOG_ERROR_STR ("this_sector=0");
@@ -604,8 +604,8 @@
goto leave;
}
- if ((DISK_LOCK(fileEntry)->file_lock == OCFS_DLM_ENABLE_CACHE_LOCK) &&
- (DISK_LOCK(fileEntry)->curr_master == osb->node_num))
+ if ((DISK_LOCK(fileEntry)->dl_level == OCFS_DLM_ENABLE_CACHE_LOCK) &&
+ (DISK_LOCK(fileEntry)->dl_master == osb->node_num))
locktype = OCFS_DLM_ENABLE_CACHE_LOCK;
else
locktype = OCFS_DLM_EXCLUSIVE_LOCK;
@@ -644,7 +644,7 @@
fileEntry->i_mtime = OCFS_CURRENT_TIME;
- DISK_LOCK(fileEntry)->dlock_seq_num = 0;
+ DISK_LOCK(fileEntry)->dl_seq_num = 0;
ocfs_fe_set_attributes(fileEntry, attr);
/* Set the valid bit here */
@@ -981,8 +981,8 @@
lockId = fe->i_blkno << osb->sb->s_blocksize_bits;
lockFlags = FLAG_FILE_TRUNCATE;
- if ((DISK_LOCK(fe)->file_lock == OCFS_DLM_ENABLE_CACHE_LOCK)
- && (DISK_LOCK(fe)->curr_master == osb->node_num))
+ if ((DISK_LOCK(fe)->dl_level == OCFS_DLM_ENABLE_CACHE_LOCK)
+ && (DISK_LOCK(fe)->dl_master == osb->node_num))
locktype = OCFS_DLM_ENABLE_CACHE_LOCK;
else
locktype = OCFS_DLM_EXCLUSIVE_LOCK;
@@ -1036,7 +1036,7 @@
goto leave;
}
- DISK_LOCK(fe)->dlock_seq_num = 0;
+ DISK_LOCK(fe)->dl_seq_num = 0;
fe->i_flags |= OCFS2_VALID_FL;
fe->i_flags &= ~(OCFS2_CHANGE_FL);
fe->i_mtime = OCFS_CURRENT_TIME;
@@ -1269,7 +1269,7 @@
up (&(OCFS_I(inode)->priv_sem));
/* no need to do OCFS_SECTOR_ALIGN once the allocation size is correct. */
- DISK_LOCK(fe)->dlock_seq_num = 0;
+ DISK_LOCK(fe)->dl_seq_num = 0;
}
/* Update tha file size and add the new one to old one. */
Modified: branches/format-changes/src/inode.c
===================================================================
--- branches/format-changes/src/inode.c 2004-06-11 01:42:56 UTC (rev 1050)
+++ branches/format-changes/src/inode.c 2004-06-11 09:42:10 UTC (rev 1051)
@@ -415,7 +415,7 @@
OCFS_I(inode)->alloc_size =
(u64)fe->i_clusters << osb->s_clustersize_bits;
OCFS_I(inode)->inode = inode;
- OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dlock_seq_num;
+ OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dl_seq_num;
OCFS_I(inode)->u.fe_private = fe->u.fe_private;
if (S_ISDIR(fe->i_mode))
@@ -1812,7 +1812,7 @@
if ((OCFS_I(inode)->alloc_size !=
(__s64)((u64)fe->i_clusters << osb->s_clustersize_bits)) ||
(inode->i_size != (__s64) fe->i_size) ||
- (OCFS_I(inode)->chng_seq_num != DISK_LOCK(fe)->dlock_seq_num) ||
+ (OCFS_I(inode)->chng_seq_num != DISK_LOCK(fe)->dl_seq_num) ||
inode->i_uid != fe->i_uid ||
inode->i_gid != fe->i_gid ||
inode->i_mode != fe->i_mode ||
@@ -1830,7 +1830,7 @@
inode->i_size = fe->i_size;
printk("verifyupdate: setting nlink from %d to %d for %llu\n", inode->i_nlink, fe->i_links_count, GET_INODE_FEOFF(inode));
inode->i_nlink = fe->i_links_count;
- OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dlock_seq_num;
+ OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dl_seq_num;
inode->i_blocks = (inode->i_size + osb->sect_size) >> osb->sect_size_bits;
inode->i_uid = fe->i_uid;
inode->i_gid = fe->i_gid;
@@ -1843,7 +1843,7 @@
(OCFS_I(inode)->alloc_size !=
(__s64)((u64)fe->i_clusters << osb->s_clustersize_bits) ||
inode->i_size != (__s64) fe->i_size ||
- OCFS_I(inode)->chng_seq_num != DISK_LOCK(fe)->dlock_seq_num)) {
+ OCFS_I(inode)->chng_seq_num != DISK_LOCK(fe)->dl_seq_num)) {
*needs_trunc = 1;
}
Modified: branches/format-changes/src/lockres.c
===================================================================
--- branches/format-changes/src/lockres.c 2004-06-11 01:42:56 UTC (rev 1050)
+++ branches/format-changes/src/lockres.c 2004-06-11 09:42:10 UTC (rev 1051)
@@ -96,8 +96,8 @@
if (!IS_VALID_FILE_ENTRY(fe))
BUG();
- lockres->lock_type = DISK_LOCK(fe)->file_lock;
- lockres->master_node_num = DISK_LOCK(fe)->curr_master;
+ lockres->lock_type = DISK_LOCK(fe)->dl_level;
+ lockres->master_node_num = DISK_LOCK(fe)->dl_master;
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe), &lockres->oin_openmap);
if (lockres->readonly_node != OCFS_INVALID_NODE_NUM &&
Modified: branches/format-changes/src/namei.c
===================================================================
--- branches/format-changes/src/namei.c 2004-06-11 01:42:56 UTC (rev 1050)
+++ branches/format-changes/src/namei.c 2004-06-11 09:42:10 UTC (rev 1051)
@@ -404,9 +404,9 @@
fe->i_records = ocfs_extent_recs_per_inode(osb->sb);
fe->i_flags |= OCFS2_VALID_FL;
fe->i_flags &= ~(OCFS2_CHANGE_FL);
- DISK_LOCK(fe)->dlock_seq_num = 0;
- DISK_LOCK(fe)->curr_master = osb->node_num;
- DISK_LOCK(fe)->file_lock = OCFS_DLM_ENABLE_CACHE_LOCK;
+ DISK_LOCK(fe)->dl_seq_num = 0;
+ DISK_LOCK(fe)->dl_master = osb->node_num;
+ DISK_LOCK(fe)->dl_level = OCFS_DLM_ENABLE_CACHE_LOCK;
ocfs_set_disk_lock_open_map(osb, DISK_LOCK(fe), &just_me);
fe->i_atime = fe->i_ctime = fe->i_mtime = OCFS_CURRENT_TIME;
fe->i_dtime = 0;
Modified: branches/format-changes/src/nm.c
===================================================================
--- branches/format-changes/src/nm.c 2004-06-11 01:42:56 UTC (rev 1050)
+++ branches/format-changes/src/nm.c 2004-06-11 09:42:10 UTC (rev 1051)
@@ -889,7 +889,7 @@
LOG_ERROR_STATUS (status);
if (status >= 0) {
fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
- DISK_LOCK(fe)->curr_master = node_num;
+ DISK_LOCK(fe)->dl_master = node_num;
OCFS_BH_PUT_DATA(fe_bh);
status = ocfs_write_bh(osb, fe_bh, 0, inode);
if (status < 0)
@@ -1010,7 +1010,7 @@
fe = OCFS_BH_GET_DATA_READ(fe_bh);
is_dir = S_ISDIR(fe->i_mode);
- is_locked = DISK_LOCK(fe)->file_lock > OCFS_DLM_NO_LOCK;
+ is_locked = DISK_LOCK(fe)->dl_level > OCFS_DLM_NO_LOCK;
if (vote_type == CHANGE_MASTER) {
OCFS_BH_PUT_DATA(fe_bh);
fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
@@ -1020,7 +1020,7 @@
ocfs_node_map_set_bit(&disk_map, osb->node_num);
ocfs_set_disk_lock_open_map(osb, DISK_LOCK(fe), &disk_map);
}
- DISK_LOCK(fe)->curr_master = node_num;
+ DISK_LOCK(fe)->dl_master = node_num;
}
OCFS_BH_PUT_DATA(fe_bh);
@@ -1032,7 +1032,7 @@
if (vote_type == RELEASE_CACHE) {
LOG_TRACE_STR("release cache vote, setting to NO_LOCK");
fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
- DISK_LOCK(fe)->file_lock = OCFS_DLM_NO_LOCK;
+ DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(fe_bh);
}
status = ocfs_write_bh(osb, fe_bh, 0, inode);
Modified: branches/format-changes/src/ocfs.h
===================================================================
--- branches/format-changes/src/ocfs.h 2004-06-11 01:42:56 UTC (rev 1050)
+++ branches/format-changes/src/ocfs.h 2004-06-11 09:42:10 UTC (rev 1051)
@@ -615,20 +615,20 @@
ocfs_vol_disk_hdr; // END CLASS
-typedef struct _ocfs_disk_lock
+typedef struct _ocfs2_disk_lock
{
-/*00*/ __u32 curr_master; /* Node number of current master */
- __u8 file_lock; /* Lock level */
- __u8 odl_pad[3]; /* Pad to u64 */
- __u64 dlock_seq_num; /* Lock transaction seqnum */
-/*10*/ __u32 oin_node_map[8]; /* Bitmap of interested nodes, was __u32 */
+/*00*/ __u32 dl_master; /* Node number of current master */
+ __u8 dl_level; /* Lock level */
+ __u8 dl_pad[3]; /* Pad to u64 */
+ __u64 dl_seq_num; /* Lock transaction seqnum */
+/*10*/ __u32 dl_node_map[8]; /* Bitmap of interested nodes,
+ was __u32 */
/*30*/
-}
-ocfs_disk_lock;
+} ocfs2_disk_lock;
typedef struct _ocfs_vol_label // CLASS
{
- ocfs_disk_lock disk_lock; // DISKLOCK
+ ocfs2_disk_lock disk_lock; // DISKLOCK
__u8 label[MAX_VOL_LABEL_LEN]; // CHAR[MAX_VOL_LABEL_LEN]
__u16 label_len; // NUMBER RANGE(0,MAX_VOL_LABEL_LEN)
__u8 vol_id[MAX_VOL_ID_LENGTH]; // HEX[MAX_VOL_ID_LENGTH]
@@ -660,7 +660,7 @@
typedef struct _ocfs_node_config_info // CLASS
{
- ocfs_disk_lock disk_lock; // DISKLOCK
+ ocfs2_disk_lock disk_lock; // DISKLOCK
__u8 node_name[MAX_NODE_NAME_LENGTH+1]; // CHAR[MAX_NODE_NAME_LENGTH+1]
ocfs_guid guid; // GUID
ocfs_ipc_config_info ipc_config; // IPCONFIG
@@ -669,7 +669,7 @@
typedef struct _ocfs_node_config_hdr // CLASS
{
- ocfs_disk_lock disk_lock; // DISKLOCK
+ ocfs2_disk_lock disk_lock; // DISKLOCK
__u8 signature[NODE_CONFIG_SIGN_LEN]; // CHAR[NODE_CONFIG_SIGN_LEN]
__u32 version; // NUMBER RANGE(0,ULONG_MAX)
__u32 num_nodes; // NUMBER RANGE(0,32)
@@ -824,7 +824,7 @@
#define OCFS_I(i) ((ocfs_inode_private *)(i->u.generic_ip))
-#define DISK_LOCK(x) ((ocfs_disk_lock *)&(x)->disk_lock)
+#define DISK_LOCK(x) ((ocfs2_disk_lock *)&(x)->i_disk_lock)
#define GET_INODE_CLEAN_SEQ(i) (atomic_t *)(&(OCFS_I(i)->i_clean_buffer_seq))
@@ -1175,7 +1175,7 @@
typedef struct _ocfs_local_alloc
{
- ocfs_disk_lock disk_lock;
+ ocfs2_disk_lock disk_lock;
__u8 signature[8]; /* "LCLBMP" */
__u32 alloc_size; /* num bits taken from main bitmap */
__u32 num_used; /* num bits used (is this needed?) */
@@ -1214,7 +1214,7 @@
belongs to */
/*10*/ __u64 i_suballoc_blkno; /* Node suballocator offset,
in blocks */
-/*18*/ ocfs_disk_lock disk_lock; /* Lock structure */
+/*18*/ ocfs2_disk_lock i_disk_lock; /* Lock structure */
/*38*/ __u32 i_uid; /* Owner UID */
__u32 i_gid; /* Owning GID */
/*40*/ __u64 i_size; /* Size in bytes */
Modified: branches/format-changes/src/sysfile.c
===================================================================
--- branches/format-changes/src/sysfile.c 2004-06-11 01:42:56 UTC (rev 1050)
+++ branches/format-changes/src/sysfile.c 2004-06-11 09:42:10 UTC (rev 1051)
@@ -438,8 +438,8 @@
(u32)(actualLength >> osb->s_clustersize_bits);
fe->i_size = FileSize;
- DISK_LOCK(fe)->curr_master = osb->node_num;
- DISK_LOCK(fe)->file_lock = OCFS_DLM_ENABLE_CACHE_LOCK;
+ DISK_LOCK(fe)->dl_master = osb->node_num;
+ DISK_LOCK(fe)->dl_level = OCFS_DLM_ENABLE_CACHE_LOCK;
OCFS_BH_PUT_DATA(fe_bh);
fe = NULL;
Modified: branches/format-changes/src/volcfg.c
===================================================================
--- branches/format-changes/src/volcfg.c 2004-06-11 01:42:56 UTC (rev 1050)
+++ branches/format-changes/src/volcfg.c 2004-06-11 09:42:10 UTC (rev 1051)
@@ -321,7 +321,7 @@
int tried_acq = 0;
int break_lock = 0;
int bh_locked = 0;
- ocfs_disk_lock *disk_lock;
+ ocfs2_disk_lock *disk_lock;
ocfs_cfg_task *cfg_task;
__u32 sect_size;
__u64 lock_node_num = OCFS_INVALID_NODE_NUM;
@@ -371,11 +371,11 @@
lock_buf = OCFS_BH_GET_DATA_WRITE(bh);
bh_locked = 1;
- disk_lock = (ocfs_disk_lock *) lock_buf;
- lock_node_num = disk_lock->curr_master;
+ disk_lock = (ocfs2_disk_lock *)lock_buf;
+ lock_node_num = disk_lock->dl_master;
- if (disk_lock->file_lock == 0 || break_lock) {
- if (disk_lock->file_lock != 0)
+ if (disk_lock->dl_level == 0 || break_lock) {
+ if (disk_lock->dl_level != 0)
LOG_TRACE_STR ("Try to break node config lock");
else
LOG_TRACE_STR ("Lock node config");
@@ -383,8 +383,8 @@
/* Attempt to lock volcfg */
memcpy(disk_lock, cfg_buf, osb->sect_size);
- disk_lock->curr_master = osb->node_num;
- disk_lock->file_lock = 1;
+ disk_lock->dl_master = osb->node_num;
+ disk_lock->dl_level = 1;
memcpy(cfg_buf, disk_lock, osb->sect_size);
/* Write into volcfg lock sector... */
@@ -428,10 +428,9 @@
add_timer(&osb->lock_timer);
/* Write the config info into the disk */
- disk_lock = (ocfs_disk_lock *) cfg_buf;
- disk_lock->curr_master =
- OCFS_INVALID_NODE_NUM;
- disk_lock->file_lock = 0;
+ disk_lock = (ocfs2_disk_lock *)cfg_buf;
+ disk_lock->dl_master = OCFS_INVALID_NODE_NUM;
+ disk_lock->dl_level = 0;
if (op == OCFS_VOLCFG_ADD)
status = ocfs_add_to_disk_config (osb, node_num,
@@ -447,12 +446,12 @@
}
break;
} else {
- disk_lock = (ocfs_disk_lock *) lock_buf;
- if (disk_lock->curr_master == lock_node_num)
+ disk_lock = (ocfs2_disk_lock *)lock_buf;
+ if (disk_lock->dl_master == lock_node_num)
break_lock = 1;
else {
LOG_TRACE_ARGS ("Node config locked by node: %d\n",
- disk_lock->curr_master);
+ disk_lock->dl_master);
ocfs_sleep (OCFS_VOLCFG_LOCK_TIME);
}
OCFS_BH_PUT_DATA(bh);
More information about the Ocfs2-commits
mailing list