[Ocfs2-commits] mfasheh commits r1233 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Jul 2 13:50:41 CDT 2004
Author: mfasheh
Date: 2004-07-02 12:50:39 -0500 (Fri, 02 Jul 2004)
New Revision: 1233
Modified:
trunk/src/alloc.c
trunk/src/dir.c
trunk/src/dlm.c
trunk/src/file.c
trunk/src/namei.c
trunk/src/nm.c
trunk/src/ocfs.h
Log:
* rename OCFS_DLM_ENABLE_CACHE_LOCK to OCFS_DLM_CACHE_LOCK
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-07-02 05:53:45 UTC (rev 1232)
+++ trunk/src/alloc.c 2004-07-02 17:50:39 UTC (rev 1233)
@@ -2924,14 +2924,14 @@
ocfs_handle_add_inode(handle, bitmap_inode);
/* Get the allocation lock here */
- status = ocfs_acquire_lock(osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
0, &bh, bitmap_inode);
if (status < 0) {
if (status != -EINTR)
LOG_ERROR_STATUS (status);
goto leave;
}
- ocfs_handle_add_lock(handle, OCFS_DLM_ENABLE_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
0, bh, bitmap_inode, 1);
}
@@ -3847,7 +3847,7 @@
ocfs_handle_add_inode(handle, main_bm_inode);
/* Get the allocation lock here */
- status = ocfs_acquire_lock(osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
0, &main_bm_bh, main_bm_inode);
if (status < 0) {
main_bm_bh = NULL;
@@ -3856,7 +3856,7 @@
goto bail;
}
- ocfs_handle_add_lock(handle, OCFS_DLM_ENABLE_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
0, main_bm_bh, main_bm_inode, 1);
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-07-02 05:53:45 UTC (rev 1232)
+++ trunk/src/dir.c 2004-07-02 17:50:39 UTC (rev 1233)
@@ -93,7 +93,7 @@
* read lock is such a bad idea in this case... */
down_write(&OCFS_I(inode)->ip_io_sem);
- error = ocfs_acquire_lock(osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ error = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
FLAG_DIR|FLAG_READDIR, NULL, inode);
if (error < 0) {
if (error != -EINTR)
@@ -220,7 +220,7 @@
bail:
if (have_disk_lock) {
- error = ocfs_release_lock (osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ error = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
FLAG_DIR|FLAG_READDIR, NULL,
inode);
if (error < 0)
@@ -255,7 +255,7 @@
if (take_lock) {
/* Get a lock on the directory... */
- status = ocfs_acquire_lock (osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
FLAG_DIR|FLAG_READDIR,
&bh, inode);
if (status < 0) {
@@ -280,7 +280,7 @@
if (take_lock && lock_acq)
{
- tmpstat = ocfs_release_lock (osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ tmpstat = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
FLAG_DIR|FLAG_READDIR, bh, inode);
if (tmpstat < 0) {
LOG_ERROR_STATUS (tmpstat);
Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c 2004-07-02 05:53:45 UTC (rev 1232)
+++ trunk/src/dlm.c 2004-07-02 17:50:39 UTC (rev 1233)
@@ -265,7 +265,7 @@
}
/* The local node is not the master */
- if (lock_level == OCFS_DLM_ENABLE_CACHE_LOCK) {
+ if (lock_level == OCFS_DLM_CACHE_LOCK) {
ocfs_acquire_lockres(lockres, 0); // ocfs_file_open ocfs_symlink
lockres->lock_type = lock_level;
lockres->master_node_num = curr_master;
@@ -905,7 +905,7 @@
if (lockres->readonly_node != OCFS_INVALID_NODE_NUM)
goto skip_lock_write;
if (lockres->master_node_num == osb->node_num &&
- lockres->lock_type == OCFS_DLM_ENABLE_CACHE_LOCK) {
+ lockres->lock_type == OCFS_DLM_CACHE_LOCK) {
/* local node is master */
#ifdef VERBOSE_LOCKING_TRACE
printk("acquirelock: setting ronode, was=%d, now=%d, master=%d\n",
@@ -921,7 +921,7 @@
extra_lock_flags = FLAG_REMASTER;
} else {
/* valid master, but either not cachelock or elsewhere */
- if (lockres->lock_type != OCFS_DLM_ENABLE_CACHE_LOCK) {
+ if (lockres->lock_type != OCFS_DLM_CACHE_LOCK) {
/* treat just like a normal master change request */
extra_lock_flags = FLAG_CHANGE_MASTER;
}
@@ -953,7 +953,7 @@
| FLAG_RELEASE_DENTRY)) {
if (ocfs_journal_new_file_search(osb, lock_id)!=0) {
extra_lock_flags = 0;
- } else if (lockres->lock_type == OCFS_DLM_ENABLE_CACHE_LOCK)
+ } else if (lockres->lock_type == OCFS_DLM_CACHE_LOCK)
extra_lock_flags = FLAG_FAST_PATH_LOCK;
else
extra_lock_flags = FLAG_CHANGE_MASTER;
@@ -961,7 +961,7 @@
if (flags & (FLAG_FILE_EXTEND | FLAG_FILE_TRUNCATE) &&
ocfs_journal_new_file_search(osb, lock_id)!=0)
extra_lock_flags = FLAG_REMASTER;
- else if (lockres->lock_type == OCFS_DLM_ENABLE_CACHE_LOCK)
+ else if (lockres->lock_type == OCFS_DLM_CACHE_LOCK)
extra_lock_flags = FLAG_FAST_PATH_LOCK;
else
extra_lock_flags = FLAG_CHANGE_MASTER;
@@ -1182,9 +1182,9 @@
if (flags & FLAG_FILE_RELEASE_MASTER)
DISK_LOCK(fe)->dl_master = OCFS_INVALID_NODE_NUM;
- if ((DISK_LOCK(fe)->dl_level == OCFS_DLM_ENABLE_CACHE_LOCK) &&
+ if ((DISK_LOCK(fe)->dl_level == OCFS_DLM_CACHE_LOCK) &&
(DISK_LOCK(fe)->dl_master == osb->node_num)) {
- lockres->lock_type = OCFS_DLM_ENABLE_CACHE_LOCK;
+ lockres->lock_type = OCFS_DLM_CACHE_LOCK;
cachelock = 1;
LOG_TRACE_STR("keeping at CACHE_LOCK");
}
@@ -1231,7 +1231,7 @@
ocfs_acquire_lockres (lockres, 0); // ocfs_release_lock
- if ((lockres->lock_type == OCFS_DLM_ENABLE_CACHE_LOCK) &&
+ if ((lockres->lock_type == OCFS_DLM_CACHE_LOCK) &&
(lockres->master_node_num == osb->node_num) &&
!(flags & FLAG_FILE_DELETE) && !(flags & FLAG_FILE_EXTEND)
&& !(FLAG_FILE_TRUNCATE)) {
@@ -1240,7 +1240,7 @@
}
if (flags & FLAG_READDIR) {
- if (lockres->lock_type != OCFS_DLM_ENABLE_CACHE_LOCK ||
+ if (lockres->lock_type != OCFS_DLM_CACHE_LOCK ||
lockres->master_node_num != lockres->readonly_node ||
lockres->master_node_num == OCFS_INVALID_NODE_NUM)
LOG_ERROR_ARGS("READDIR release has issues! type=%d, master=%d, ronode=%d\n",
@@ -1347,7 +1347,7 @@
fe = (ocfs2_dinode *) bh->b_data;
/* may not need to rewrite the lock later if we already have a cachelock */
need_lock_write = (DISK_LOCK(fe)->dl_master != osb->node_num ||
- DISK_LOCK(fe)->dl_level != OCFS_DLM_ENABLE_CACHE_LOCK);
+ DISK_LOCK(fe)->dl_level != OCFS_DLM_CACHE_LOCK);
} else
need_lock_write = 0;
need_to_zap_buffers = 0;
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-07-02 05:53:45 UTC (rev 1232)
+++ trunk/src/file.c 2004-07-02 17:50:39 UTC (rev 1233)
@@ -595,9 +595,9 @@
goto leave;
}
- if ((DISK_LOCK(fileEntry)->dl_level == OCFS_DLM_ENABLE_CACHE_LOCK) &&
+ if ((DISK_LOCK(fileEntry)->dl_level == OCFS_DLM_CACHE_LOCK) &&
(DISK_LOCK(fileEntry)->dl_master == osb->node_num))
- locktype = OCFS_DLM_ENABLE_CACHE_LOCK;
+ locktype = OCFS_DLM_CACHE_LOCK;
else
locktype = OCFS_DLM_EXCLUSIVE_LOCK;
@@ -975,9 +975,9 @@
lockFlags = FLAG_FILE_TRUNCATE;
- if ((DISK_LOCK(fe)->dl_level == OCFS_DLM_ENABLE_CACHE_LOCK)
+ if ((DISK_LOCK(fe)->dl_level == OCFS_DLM_CACHE_LOCK)
&& (DISK_LOCK(fe)->dl_master == osb->node_num))
- locktype = OCFS_DLM_ENABLE_CACHE_LOCK;
+ locktype = OCFS_DLM_CACHE_LOCK;
else
locktype = OCFS_DLM_EXCLUSIVE_LOCK;
@@ -1084,7 +1084,7 @@
u32 bitmapOffset = 0;
u32 numClustersAlloc = 0;
__u32 lockFlags = 0;
- __u32 locktype = OCFS_DLM_ENABLE_CACHE_LOCK;
+ __u32 locktype = OCFS_DLM_CACHE_LOCK;
int have_disk_lock = 0;
u64 block_off;
u64 num_blocks;
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-07-02 05:53:45 UTC (rev 1232)
+++ trunk/src/namei.c 2004-07-02 17:50:39 UTC (rev 1233)
@@ -228,7 +228,7 @@
ocfs_handle_set_sync(handle, 0);
/* lock the parent directory */
- status = ocfs_acquire_lock (osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE | FLAG_DIR,
&parent_fe_bh, dir);
if (status < 0) {
@@ -238,7 +238,7 @@
}
/* Ok, we got the lock -- we'd better add it to our transaction */
- ocfs_handle_add_lock(handle, OCFS_DLM_ENABLE_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE | FLAG_DIR, parent_fe_bh, dir,
0);
@@ -448,7 +448,7 @@
fe->i_flags |= OCFS2_VALID_FL;
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;
+ DISK_LOCK(fe)->dl_level = OCFS_DLM_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;
@@ -573,7 +573,7 @@
down_write(&OCFS_I(dir)->ip_io_sem);
/* lock the parent directory */
- err = ocfs_acquire_lock (osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ err = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE | FLAG_DIR,
&parent_fe_bh, dir);
if (err < 0) {
@@ -586,7 +586,7 @@
down_write(&OCFS_I(inode)->ip_io_sem);
- err = ocfs_acquire_lock (osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ err = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE,
&fe_bh, inode);
if (err < 0) {
@@ -638,7 +638,7 @@
ocfs_commit_trans(handle);
if (cleanup_parent) {
- tmpstat = ocfs_release_lock (osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ tmpstat = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE | FLAG_DIR,
parent_fe_bh, dir);
if (tmpstat < 0)
@@ -648,7 +648,7 @@
}
if (cleanup_fe) {
- tmpstat = ocfs_release_lock(osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ tmpstat = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE
| FLAG_FILE_UPDATE_OIN,
fe_bh,
@@ -1545,7 +1545,7 @@
}
/* lock the parent directory */
- status = ocfs_acquire_lock(osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE | FLAG_DIR,
&parent_fe_bh, dir);
if (status < 0) {
@@ -1616,7 +1616,7 @@
if (got_lock) {
int tmpstat;
- tmpstat = ocfs_release_lock (osb, OCFS_DLM_ENABLE_CACHE_LOCK,
+ tmpstat = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE | FLAG_DIR,
parent_fe_bh, dir);
if (tmpstat < 0)
@@ -2028,7 +2028,7 @@
LOG_ERROR_STATUS(status);
goto leave;
}
- ocfs_handle_add_lock(handle, OCFS_DLM_ENABLE_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE | FLAG_DIR, orphan_dir_bh,
orphan_dir_inode, 1);
Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c 2004-07-02 05:53:45 UTC (rev 1232)
+++ trunk/src/nm.c 2004-07-02 17:50:39 UTC (rev 1233)
@@ -501,7 +501,7 @@
goto done;
} else if (flags & FLAG_READDIR) {
if (lockres->master_node_num == osb->node_num &&
- lockres->lock_type == OCFS_DLM_ENABLE_CACHE_LOCK) {
+ lockres->lock_type == OCFS_DLM_CACHE_LOCK) {
vote_type = READONLY;
} else
vote_type = INVALID_REQUEST;
@@ -1164,7 +1164,7 @@
/* this path should always succeed on the vote *
* even in the error case. do nothing for error. */
if (lockres->master_node_num != node_num ||
- lockres->lock_type != OCFS_DLM_ENABLE_CACHE_LOCK ||
+ lockres->lock_type != OCFS_DLM_CACHE_LOCK ||
!ocfs_node_map_is_empty(&lockres->readonly_map))
LOG_ERROR_ARGS("(drop-ro) master=%d node_num=%d locktype=%d ronode=%d\n",
lockres->master_node_num, node_num, lockres->lock_type,
@@ -1422,7 +1422,7 @@
/* check these under the lock */
if (lockres->readonly_node != osb->node_num ||
lockres->master_node_num != osb->node_num ||
- lockres->lock_type != OCFS_DLM_ENABLE_CACHE_LOCK) {
+ lockres->lock_type != OCFS_DLM_CACHE_LOCK) {
LOG_ERROR_ARGS("bad RO lockres! this=%d, ro_node=%d, master=%d, locktype=%u\n",
osb->node_num, lockres->readonly_node,
lockres->master_node_num, lockres->lock_type);
@@ -1445,7 +1445,7 @@
/* remove all dead nodes */
ocfs_node_map_and(&lockres->readonly_map, &osb->publ_map);
- status = new_lock_function(osb, OCFS_DLM_ENABLE_CACHE_LOCK, FLAG_DROP_READONLY,
+ status = new_lock_function(osb, OCFS_DLM_CACHE_LOCK, FLAG_DROP_READONLY,
NULL, &disk_vote, inode);
if (status == -EAGAIN) {
status = 0;
Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h 2004-07-02 05:53:45 UTC (rev 1232)
+++ trunk/src/ocfs.h 2004-07-02 17:50:39 UTC (rev 1233)
@@ -188,7 +188,7 @@
// LOCKTYPE ONE
#define OCFS_DLM_NO_LOCK (0x0)
#define OCFS_DLM_EXCLUSIVE_LOCK (0x2)
-#define OCFS_DLM_ENABLE_CACHE_LOCK (0x8)
+#define OCFS_DLM_CACHE_LOCK (0x8)
#define OCFS_INVALID_NODE_NUM UINT_MAX
@@ -1030,7 +1030,7 @@
static inline int ocfs_is_local_cache_lock(ocfs_super *osb, struct inode *inode)
{
ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);
- if (lockres->lock_type == OCFS_DLM_ENABLE_CACHE_LOCK &&
+ if (lockres->lock_type == OCFS_DLM_CACHE_LOCK &&
lockres->master_node_num == osb->node_num)
return 1;
return 0;
More information about the Ocfs2-commits
mailing list