[Ocfs2-commits] mfasheh commits r1236 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Jul 2 18:12:45 CDT 2004
Author: mfasheh
Date: 2004-07-02 17:12:44 -0500 (Fri, 02 Jul 2004)
New Revision: 1236
Modified:
trunk/src/alloc.c
trunk/src/dir.c
trunk/src/dlm.c
trunk/src/file.c
trunk/src/inode.c
trunk/src/journal.c
trunk/src/lockres.c
trunk/src/namei.c
trunk/src/nm.c
trunk/src/ocfs.h
Log:
* use more standardized lock types / names. This will be important for
when we can plug in a real DLM.
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-07-02 22:09:17 UTC (rev 1235)
+++ trunk/src/alloc.c 2004-07-02 22:12:44 UTC (rev 1236)
@@ -362,7 +362,7 @@
ocfs_handle_add_inode(handle, inode_alloc_inode[i]);
status = ocfs_acquire_lock (osb,
- OCFS_DLM_CACHE_LOCK,
+ OCFS_LKM_EXMODE,
FLAG_FILE_CREATE,
NULL,
inode_alloc_inode[i]);
@@ -388,7 +388,7 @@
ocfs_handle_add_inode(handle, ext_alloc_inode[i]);
status = ocfs_acquire_lock (osb,
- OCFS_DLM_CACHE_LOCK,
+ OCFS_LKM_EXMODE,
FLAG_FILE_CREATE,
NULL,
ext_alloc_inode[i]);
@@ -411,7 +411,7 @@
}
ocfs_handle_add_inode(handle, vol_inode);
- status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE,
&globalbh, vol_inode);
if (status < 0) {
@@ -471,7 +471,7 @@
if (vol_inode) {
down_write(&OCFS_I(vol_inode)->ip_io_sem);
- status = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_release_lock(osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE, globalbh,
vol_inode);
up_write(&OCFS_I(vol_inode)->ip_io_sem);
@@ -485,7 +485,7 @@
if (ext_alloc_free[i] != NULL) {
down_write(&OCFS_I(ext_alloc_inode[i])->ip_io_sem);
status = ocfs_release_lock (osb,
- OCFS_DLM_CACHE_LOCK,
+ OCFS_LKM_EXMODE,
FLAG_FILE_CREATE,
NULL, ext_alloc_inode[i]);
up_write(&OCFS_I(ext_alloc_inode[i])->ip_io_sem);
@@ -2924,14 +2924,14 @@
ocfs_handle_add_inode(handle, bitmap_inode);
/* Get the allocation lock here */
- status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
0, &bh, bitmap_inode);
if (status < 0) {
if (status != -EINTR)
LOG_ERROR_STATUS (status);
goto leave;
}
- ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_LKM_EXMODE,
0, bh, bitmap_inode, 1);
}
@@ -3141,14 +3141,14 @@
/* Allocate a block of size blocksize from the relevant file/bitmap */
OCFS_ASSERT (blockSize);
- status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE, &bh, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto leave;
}
- ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE,
bh, 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_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
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_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_LKM_EXMODE,
0, main_bm_bh, main_bm_inode, 1);
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-07-02 22:09:17 UTC (rev 1235)
+++ trunk/src/dir.c 2004-07-02 22:12:44 UTC (rev 1236)
@@ -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_CACHE_LOCK,
+ error = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
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_CACHE_LOCK,
+ error = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
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_CACHE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE,
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_CACHE_LOCK,
+ tmpstat = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
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 22:09:17 UTC (rev 1235)
+++ trunk/src/dlm.c 2004-07-02 22:12:44 UTC (rev 1236)
@@ -256,7 +256,7 @@
/* Reset the lock as not owned and return success?? */
/* This needs to be under some sort of cluster wide lock, */
DISK_LOCK(fe)->dl_master = OCFS_INVALID_NODE_NUM;
- DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
+ DISK_LOCK(fe)->dl_level = OCFS_LKM_NLMODE;
tmpstat = ocfs_write_bh (osb, bh, 0, NULL);
if (tmpstat < 0) {
LOG_ERROR_STATUS (status = tmpstat);
@@ -265,7 +265,7 @@
}
/* The local node is not the master */
- if (lock_level == OCFS_DLM_CACHE_LOCK) {
+ if (lock_level == OCFS_LKM_EXMODE) {
ocfs_acquire_lockres(lockres, 0); // ocfs_file_open ocfs_symlink
lockres->lock_type = lock_level;
lockres->master_node_num = curr_master;
@@ -313,7 +313,7 @@
goto got_it;
} else {
for (status = -EAGAIN; status==-EAGAIN; ) {
- status = new_lock_function(osb, OCFS_DLM_NO_LOCK,
+ status = new_lock_function(osb, OCFS_LKM_NLMODE,
FLAG_ACQUIRE_LOCK|FLAG_FILE_RELEASE_CACHE,
NULL, &disk_vote, inode);
if (status == -EAGAIN)
@@ -333,8 +333,8 @@
}
LOG_TRACE_ARGS("broke cache lock, setting to NO_LOCK\n");
fe = (ocfs2_dinode *) bh->b_data;
- DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
- lock_level = OCFS_DLM_NO_LOCK;
+ DISK_LOCK(fe)->dl_level = OCFS_LKM_NLMODE;
+ lock_level = OCFS_LKM_NLMODE;
tmpstat = ocfs_write_bh (osb, bh, 0, inode);
if (tmpstat < 0) {
LOG_ERROR_STATUS (tmpstat);
@@ -823,7 +823,7 @@
LOG_ENTRY_ARGS ("(0x%p, %u, %u, 0x%p)\n",
osb, lock_type, flags, bh);
- OCFS_ASSERT(lock_type != OCFS_DLM_NO_LOCK);
+ OCFS_ASSERT(lock_type != OCFS_LKM_NLMODE);
OCFS_ASSERT(inode);
lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
@@ -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_CACHE_LOCK) {
+ lockres->lock_type == OCFS_LKM_EXMODE) {
/* 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_CACHE_LOCK) {
+ if (lockres->lock_type != OCFS_LKM_EXMODE) {
/* 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_CACHE_LOCK)
+ } else if (lockres->lock_type == OCFS_LKM_EXMODE)
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_CACHE_LOCK)
+ else if (lockres->lock_type == OCFS_LKM_EXMODE)
extra_lock_flags = FLAG_FAST_PATH_LOCK;
else
extra_lock_flags = FLAG_CHANGE_MASTER;
@@ -1182,15 +1182,15 @@
if (flags & FLAG_FILE_RELEASE_MASTER)
DISK_LOCK(fe)->dl_master = OCFS_INVALID_NODE_NUM;
- if ((DISK_LOCK(fe)->dl_level == OCFS_DLM_CACHE_LOCK) &&
+ if ((DISK_LOCK(fe)->dl_level == OCFS_LKM_EXMODE) &&
(DISK_LOCK(fe)->dl_master == osb->node_num)) {
- lockres->lock_type = OCFS_DLM_CACHE_LOCK;
+ lockres->lock_type = OCFS_LKM_EXMODE;
cachelock = 1;
LOG_TRACE_STR("keeping at CACHE_LOCK");
}
else {
LOG_TRACE_STR("setting to NO_LOCK");
- DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
+ DISK_LOCK(fe)->dl_level = OCFS_LKM_NLMODE;
}
/* Reset the lock on the disk */
@@ -1231,7 +1231,7 @@
ocfs_acquire_lockres (lockres, 0); // ocfs_release_lock
- if ((lockres->lock_type == OCFS_DLM_CACHE_LOCK) &&
+ if ((lockres->lock_type == OCFS_LKM_EXMODE) &&
(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_CACHE_LOCK ||
+ if (lockres->lock_type != OCFS_LKM_EXMODE ||
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",
@@ -1249,7 +1249,7 @@
goto finally;
}
- lockres->lock_type = OCFS_DLM_NO_LOCK;
+ lockres->lock_type = OCFS_LKM_NLMODE;
if (flags & FLAG_FILE_RELEASE_MASTER)
lockres->master_node_num = OCFS_INVALID_NODE_NUM;
@@ -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_CACHE_LOCK);
+ DISK_LOCK(fe)->dl_level != OCFS_LKM_EXMODE);
} else
need_lock_write = 0;
need_to_zap_buffers = 0;
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-07-02 22:09:17 UTC (rev 1235)
+++ trunk/src/file.c 2004-07-02 22:12:44 UTC (rev 1236)
@@ -149,8 +149,8 @@
OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
30000,
(S_ISDIR (inode->i_mode) ?
- OCFS_DLM_CACHE_LOCK :
- OCFS_DLM_NO_LOCK), inode);
+ OCFS_LKM_EXMODE :
+ OCFS_LKM_NLMODE), inode);
if (status < 0) {
if (status != -EINTR) {
LOG_ERROR_STR ("Lock owner is alive and taking too much time");
@@ -608,7 +608,7 @@
ocfs_handle_set_checkpoint(handle, 0);
ocfs_handle_set_sync(handle, 0);
- status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK, lockFlags,
+ status = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE, lockFlags,
&bh, inode);
if (status < 0) {
if (status != -EINTR)
@@ -646,7 +646,7 @@
if (status < 0) {
ocfs_abort_trans(handle);
} else {
- ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_LKM_EXMODE,
lockFlags, bh, inode, 0);
have_disk_lock = 0;
@@ -654,7 +654,7 @@
}
}
if (have_disk_lock) {
- tmpstat = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
+ tmpstat = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
lockFlags, bh, inode);
if (tmpstat < 0)
LOG_ERROR_STATUS (tmpstat);
@@ -969,7 +969,7 @@
lockFlags = FLAG_FILE_TRUNCATE;
- status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK, lockFlags,
+ status = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE, lockFlags,
&bh, inode);
if (status < 0) {
if (status != -EINTR)
@@ -1037,7 +1037,7 @@
if (have_disk_lock) {
lockFlags |= FLAG_FILE_UPDATE_OIN;
- tmpstat = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
+ tmpstat = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
lockFlags, bh, inode);
if (tmpstat < 0)
LOG_ERROR_STATUS (tmpstat);
@@ -1142,7 +1142,7 @@
brelse(bh);
bh = NULL;
- status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE,
lockFlags, &bh, inode);
if (status < 0) {
if (status != -EINTR)
@@ -1334,7 +1334,7 @@
lockFlags |= FLAG_FILE_UPDATE_OIN;
ocfs_handle_add_lock(handle,
- OCFS_DLM_CACHE_LOCK,
+ OCFS_LKM_EXMODE,
lockFlags, bh, inode, 0);
have_disk_lock = 0;
@@ -1346,7 +1346,7 @@
if (have_disk_lock) {
lockFlags |= FLAG_FILE_UPDATE_OIN;
- tmpstat = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
+ tmpstat = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
lockFlags, bh, inode);
if (tmpstat < 0)
LOG_ERROR_STATUS (tmpstat);
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-07-02 22:09:17 UTC (rev 1235)
+++ trunk/src/inode.c 2004-07-02 22:12:44 UTC (rev 1236)
@@ -640,20 +640,20 @@
ocfs_handle_add_inode(handle, orphan_dir_inode);
- status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE | FLAG_DIR,
&orphan_dir_bh, orphan_dir_inode);
if (status < 0) {
LOG_ERROR_STATUS(status);
goto bail_locked;
}
- ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE | FLAG_DIR, orphan_dir_bh,
orphan_dir_inode, 1);
if (S_ISDIR(inode->i_mode))
lock_flags |= FLAG_DIR;
- status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK, lock_flags,
+ status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE, lock_flags,
&fe_bh, inode);
if (status < 0) {
/* EBUSY here is assumed to mean that other nodes are
@@ -727,7 +727,7 @@
ocfs_abort_trans(handle);
if (release_disk_lock) {
- status = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_release_lock(osb, OCFS_LKM_EXMODE,
lock_flags, fe_bh, inode);
if (status < 0)
LOG_ERROR_STATUS(status);
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-07-02 22:09:17 UTC (rev 1235)
+++ trunk/src/journal.c 2004-07-02 22:12:44 UTC (rev 1236)
@@ -1035,7 +1035,7 @@
SET_INODE_JOURNAL(inode);
/* TODO: Use another type of lock. */
- status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE, &bh, inode);
if (status < 0) {
up_write(&OCFS_I(inode)->ip_io_sem);
@@ -1192,7 +1192,7 @@
down_write(&OCFS_I(inode)->ip_io_sem);
/* unlock our journal */
- status = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE,
journal->lockbh, inode);
up_write(&OCFS_I(inode)->ip_io_sem);
@@ -1483,7 +1483,7 @@
if (osb->node_num == node_num)
BUG();
- status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE|FLAG_FILE_RECOVERY,
&bh, inode);
@@ -1589,7 +1589,7 @@
if (got_lock) {
down_write(&OCFS_I(inode)->ip_io_sem);
- status = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_release_lock(osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE|FLAG_FILE_RECOVERY,
bh, inode);
up_write(&OCFS_I(inode)->ip_io_sem);
Modified: trunk/src/lockres.c
===================================================================
--- trunk/src/lockres.c 2004-07-02 22:09:17 UTC (rev 1235)
+++ trunk/src/lockres.c 2004-07-02 22:12:44 UTC (rev 1236)
@@ -203,7 +203,7 @@
LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", osb, lockres);
- lockres->lock_type = OCFS_DLM_NO_LOCK;
+ lockres->lock_type = OCFS_LKM_NLMODE;
lockres->master_node_num = OCFS_INVALID_NODE_NUM;
lockres->last_upd_seq_num = 0;
ocfs_node_map_init(osb, &lockres->oin_openmap);
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-07-02 22:09:17 UTC (rev 1235)
+++ trunk/src/namei.c 2004-07-02 22:12:44 UTC (rev 1236)
@@ -228,7 +228,7 @@
ocfs_handle_set_sync(handle, 0);
/* lock the parent directory */
- status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE,
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_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_LKM_EXMODE,
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_CACHE_LOCK;
+ DISK_LOCK(fe)->dl_level = OCFS_LKM_EXMODE;
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_CACHE_LOCK,
+ err = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE,
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_CACHE_LOCK,
+ err = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE,
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_CACHE_LOCK,
+ tmpstat = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
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_CACHE_LOCK,
+ tmpstat = ocfs_release_lock(osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE
| FLAG_FILE_UPDATE_OIN,
fe_bh,
@@ -723,7 +723,7 @@
/* lock parent directory, yes we use FLAG_FILE_CREATE even
* though we're deleting ;) */
- status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE|FLAG_DIR, NULL,
parentInode);
if (status < 0) {
@@ -754,7 +754,7 @@
goto leave;
}
- status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE,
lockFlags, &fe_bh, inode);
if (status < 0) {
if (status != -EINTR)
@@ -855,7 +855,7 @@
/* need this to alert dentry-owners on other nodes */
/* Release the file lock if we acquired it */
if (got_file) {
- tmpstat = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
+ tmpstat = ocfs_release_lock(osb, OCFS_LKM_EXMODE,
lockFlags, fe_bh, inode);
if (tmpstat < 0)
LOG_ERROR_STATUS(tmpstat);
@@ -863,7 +863,7 @@
}
if (got_parent) {
- tmpstat = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
+ tmpstat = ocfs_release_lock(osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE|FLAG_DIR,
NULL, parentInode);
if (tmpstat < 0)
@@ -1091,10 +1091,10 @@
/* if old and new are the same, this'll just do one lock. */
status = ocfs_double_lock(osb, handle,
- OCFS_DLM_CACHE_LOCK,
+ OCFS_LKM_EXMODE,
dir_lock_flags,
&old_dir_bh, old_dir,
- OCFS_DLM_CACHE_LOCK,
+ OCFS_LKM_EXMODE,
dir_lock_flags,
&new_dir_bh, new_dir);
if (status < 0) {
@@ -1118,7 +1118,7 @@
if (S_ISDIR(old_inode->i_mode))
oldfe_flags = FLAG_DIR;
- status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
oldfe_flags, NULL, old_inode);
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -1188,7 +1188,7 @@
if (S_ISDIR(new_inode->i_mode))
newfe_flags = FLAG_DIR;
- status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
newfe_flags, &newfe_bh,
new_inode);
if (status < 0) {
@@ -1338,12 +1338,12 @@
bail:
if (got_oldlock) {
- ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
+ ocfs_release_lock(osb, OCFS_LKM_EXMODE,
oldfe_flags, NULL, old_inode);
}
if (got_newlock) {
- ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
+ ocfs_release_lock(osb, OCFS_LKM_EXMODE,
newfe_flags, NULL, new_inode);
}
@@ -1545,7 +1545,7 @@
}
/* lock the parent directory */
- status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
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_CACHE_LOCK,
+ tmpstat = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE | FLAG_DIR,
parent_fe_bh, dir);
if (tmpstat < 0)
@@ -2021,14 +2021,14 @@
ocfs_handle_add_inode(handle, orphan_dir_inode);
/* disk lock orphan dir here. */
- status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE | FLAG_DIR,
&orphan_dir_bh, orphan_dir_inode);
if (status < 0) {
LOG_ERROR_STATUS(status);
goto leave;
}
- ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_LKM_EXMODE,
FLAG_FILE_CREATE | FLAG_DIR, orphan_dir_bh,
orphan_dir_inode, 1);
Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c 2004-07-02 22:09:17 UTC (rev 1235)
+++ trunk/src/nm.c 2004-07-02 22:12:44 UTC (rev 1236)
@@ -500,7 +500,7 @@
goto done;
} else if (flags & FLAG_READDIR) {
if (lockres->master_node_num == osb->node_num &&
- lockres->lock_type == OCFS_DLM_CACHE_LOCK) {
+ lockres->lock_type == OCFS_LKM_EXMODE) {
vote_type = READONLY;
} else
vote_type = INVALID_REQUEST;
@@ -971,7 +971,7 @@
" master node is invalid!?!");
}
if ((lockres->master_node_num == osb->node_num) &&
- (lockres->lock_type < OCFS_DLM_EXCLUSIVE_LOCK)) {
+ (lockres->lock_type == OCFS_LKM_NLMODE)) {
LOG_ERROR_STR("Wowzers, how'd I hit this "
"code!?!");
}
@@ -1063,7 +1063,7 @@
lockres->master_node_num = node_num;
// if (oin != NULL) {
- lockres->lock_type = OCFS_DLM_NO_LOCK;
+ lockres->lock_type = OCFS_LKM_NLMODE;
// }
status = ocfs_read_bh(osb, lock_id, &fe_bh, lockflags, inode);
@@ -1074,7 +1074,7 @@
fe = (ocfs2_dinode *) fe_bh->b_data;
is_dir = S_ISDIR(fe->i_mode);
- is_locked = DISK_LOCK(fe)->dl_level > OCFS_DLM_NO_LOCK;
+ is_locked = DISK_LOCK(fe)->dl_level > OCFS_LKM_NLMODE;
if (vote_type == CHANGE_MASTER) {
fe = (ocfs2_dinode *) fe_bh->b_data;
if (OCFS_I(inode)->ip_open_cnt) {
@@ -1094,7 +1094,7 @@
if (vote_type == RELEASE_CACHE) {
LOG_TRACE_STR("release cache vote, setting to NO_LOCK");
fe = (ocfs2_dinode *) fe_bh->b_data;
- DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
+ DISK_LOCK(fe)->dl_level = OCFS_LKM_NLMODE;
}
status = ocfs_write_bh(osb, fe_bh, 0, inode);
if (status < 0) {
@@ -1103,7 +1103,7 @@
break;
}
if (vote_type == RELEASE_CACHE) {
- lockres->lock_type = OCFS_DLM_NO_LOCK;
+ lockres->lock_type = OCFS_LKM_NLMODE;
}
else // CHANGE_MASTER
lockres->master_node_num = node_num;
@@ -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_CACHE_LOCK ||
+ lockres->lock_type != OCFS_LKM_EXMODE ||
!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_CACHE_LOCK) {
+ lockres->lock_type != OCFS_LKM_EXMODE) {
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_CACHE_LOCK, FLAG_DROP_READONLY,
+ status = new_lock_function(osb, OCFS_LKM_EXMODE, FLAG_DROP_READONLY,
NULL, &disk_vote, inode);
if (status == -EAGAIN) {
status = 0;
Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h 2004-07-02 22:09:17 UTC (rev 1235)
+++ trunk/src/ocfs.h 2004-07-02 22:12:44 UTC (rev 1236)
@@ -185,10 +185,14 @@
NONLOCAL_EXT = 2
} ocfs_ext_flag;
-// LOCKTYPE ONE
-#define OCFS_DLM_NO_LOCK (0x0)
-#define OCFS_DLM_EXCLUSIVE_LOCK (0x2)
-#define OCFS_DLM_CACHE_LOCK (0x8)
+/* The following are standard DLM lock types, of which we currently
+ * only use a couple. */
+#define OCFS_LKM_NLMODE (0) /* null lock */
+#define OCFS_LKM_CRMODE (1) /* concurrent read */
+#define OCFS_LKM_CWMODE (2) /* concurrent write */
+#define OCFS_LKM_PRMODE (3) /* protected read */
+#define OCFS_LKM_PWMODE (4) /* protected write */
+#define OCFS_LKM_EXMODE (5) /* exclusive */
#define OCFS_INVALID_NODE_NUM -1
@@ -1030,7 +1034,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_CACHE_LOCK &&
+ if (lockres->lock_type == OCFS_LKM_EXMODE &&
lockres->master_node_num == osb->node_num)
return 1;
return 0;
More information about the Ocfs2-commits
mailing list