[Ocfs2-commits] mfasheh commits r1234 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Jul 2 14:36:20 CDT 2004
Author: mfasheh
Date: 2004-07-02 13:36:19 -0500 (Fri, 02 Jul 2004)
New Revision: 1234
Modified:
trunk/src/alloc.c
trunk/src/file.c
trunk/src/inode.c
trunk/src/journal.c
trunk/src/namei.c
Log:
* upgrade everything to CACHE_LOCK. We want to get rid of the
OCFS_DLM_EXCLUSIVE_LOCK now.
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-07-02 17:50:39 UTC (rev 1233)
+++ trunk/src/alloc.c 2004-07-02 18:36:19 UTC (rev 1234)
@@ -362,7 +362,7 @@
ocfs_handle_add_inode(handle, inode_alloc_inode[i]);
status = ocfs_acquire_lock (osb,
- OCFS_DLM_EXCLUSIVE_LOCK,
+ OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ status = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE,
NULL, ext_alloc_inode[i]);
up_write(&OCFS_I(ext_alloc_inode[i])->ip_io_sem);
@@ -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_EXCLUSIVE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE, &bh, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto leave;
}
- ocfs_handle_add_lock(handle, OCFS_DLM_EXCLUSIVE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE,
bh, inode, 1);
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-07-02 17:50:39 UTC (rev 1233)
+++ trunk/src/file.c 2004-07-02 18:36:19 UTC (rev 1234)
@@ -149,7 +149,7 @@
OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
30000,
(S_ISDIR (inode->i_mode) ?
- OCFS_DLM_EXCLUSIVE_LOCK :
+ OCFS_DLM_CACHE_LOCK :
OCFS_DLM_NO_LOCK), inode);
if (status < 0) {
if (status != -EINTR) {
@@ -572,7 +572,7 @@
int tmpstat;
ocfs2_dinode *fileEntry = NULL;
int have_disk_lock = 0;
- __u32 lockFlags = 0, locktype = 0;
+ __u32 lockFlags = 0;
struct buffer_head *bh = NULL;
ocfs_journal_handle *handle = NULL;
@@ -595,12 +595,6 @@
goto leave;
}
- if ((DISK_LOCK(fileEntry)->dl_level == OCFS_DLM_CACHE_LOCK) &&
- (DISK_LOCK(fileEntry)->dl_master == osb->node_num))
- locktype = OCFS_DLM_CACHE_LOCK;
- else
- locktype = OCFS_DLM_EXCLUSIVE_LOCK;
-
/* now we always take an UPDATE lock */
lockFlags = FLAG_FILE_UPDATE;
@@ -614,7 +608,7 @@
ocfs_handle_set_checkpoint(handle, 0);
ocfs_handle_set_sync(handle, 0);
- status = ocfs_acquire_lock (osb, locktype, lockFlags,
+ status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK, lockFlags,
&bh, inode);
if (status < 0) {
if (status != -EINTR)
@@ -652,15 +646,15 @@
if (status < 0) {
ocfs_abort_trans(handle);
} else {
- ocfs_handle_add_lock(handle, locktype, lockFlags,
- bh, inode, 0);
+ ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
+ lockFlags, bh, inode, 0);
have_disk_lock = 0;
ocfs_commit_trans(handle);
}
}
if (have_disk_lock) {
- tmpstat = ocfs_release_lock (osb, locktype,
+ tmpstat = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
lockFlags, bh, inode);
if (tmpstat < 0)
LOG_ERROR_STATUS (tmpstat);
@@ -936,7 +930,7 @@
{
int status = 0, tmpstat;
ocfs2_dinode *fe = NULL;
- __u32 lockFlags = 0, locktype = 0;
+ __u32 lockFlags = 0;
int have_disk_lock = 0;
__u64 new_alloc_size;
struct buffer_head *bh = NULL;
@@ -975,13 +969,7 @@
lockFlags = FLAG_FILE_TRUNCATE;
- if ((DISK_LOCK(fe)->dl_level == OCFS_DLM_CACHE_LOCK)
- && (DISK_LOCK(fe)->dl_master == osb->node_num))
- locktype = OCFS_DLM_CACHE_LOCK;
- else
- locktype = OCFS_DLM_EXCLUSIVE_LOCK;
-
- status = ocfs_acquire_lock (osb, locktype, lockFlags,
+ status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK, lockFlags,
&bh, inode);
if (status < 0) {
if (status != -EINTR)
@@ -1049,7 +1037,7 @@
if (have_disk_lock) {
lockFlags |= FLAG_FILE_UPDATE_OIN;
- tmpstat = ocfs_release_lock (osb, locktype,
+ tmpstat = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
lockFlags, bh, inode);
if (tmpstat < 0)
LOG_ERROR_STATUS (tmpstat);
@@ -1084,7 +1072,6 @@
u32 bitmapOffset = 0;
u32 numClustersAlloc = 0;
__u32 lockFlags = 0;
- __u32 locktype = OCFS_DLM_CACHE_LOCK;
int have_disk_lock = 0;
u64 block_off;
u64 num_blocks;
@@ -1155,7 +1142,8 @@
brelse(bh);
bh = NULL;
- status = ocfs_acquire_lock (osb, locktype, lockFlags, &bh, inode);
+ status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
+ lockFlags, &bh, inode);
if (status < 0) {
if (status != -EINTR)
LOG_ERROR_STATUS (status);
@@ -1345,7 +1333,8 @@
} else {
lockFlags |= FLAG_FILE_UPDATE_OIN;
- ocfs_handle_add_lock(handle, locktype,
+ ocfs_handle_add_lock(handle,
+ OCFS_DLM_CACHE_LOCK,
lockFlags, bh, inode, 0);
have_disk_lock = 0;
@@ -1357,7 +1346,7 @@
if (have_disk_lock) {
lockFlags |= FLAG_FILE_UPDATE_OIN;
- tmpstat = ocfs_release_lock (osb, OCFS_DLM_EXCLUSIVE_LOCK,
+ tmpstat = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
lockFlags, bh, inode);
if (tmpstat < 0)
LOG_ERROR_STATUS (tmpstat);
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-07-02 17:50:39 UTC (rev 1233)
+++ trunk/src/inode.c 2004-07-02 18:36:19 UTC (rev 1234)
@@ -640,20 +640,20 @@
ocfs_handle_add_inode(handle, orphan_dir_inode);
- status = ocfs_acquire_lock(osb, OCFS_DLM_EXCLUSIVE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ ocfs_handle_add_lock(handle, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK, lock_flags,
+ status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK, 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_EXCLUSIVE_LOCK,
+ status = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
lock_flags, fe_bh, inode);
if (status < 0)
LOG_ERROR_STATUS(status);
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-07-02 17:50:39 UTC (rev 1233)
+++ trunk/src/journal.c 2004-07-02 18:36:19 UTC (rev 1234)
@@ -1035,7 +1035,7 @@
SET_INODE_JOURNAL(inode);
/* TODO: Use another type of lock. */
- status = ocfs_acquire_lock (osb, OCFS_DLM_EXCLUSIVE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ status = ocfs_release_lock (osb, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ status = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE|FLAG_FILE_RECOVERY,
bh, inode);
up_write(&OCFS_I(inode)->ip_io_sem);
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-07-02 17:50:39 UTC (rev 1233)
+++ trunk/src/namei.c 2004-07-02 18:36:19 UTC (rev 1234)
@@ -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_EXCLUSIVE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE|FLAG_DIR, NULL,
parentInode);
if (status < 0) {
@@ -754,7 +754,7 @@
goto leave;
}
- status = ocfs_acquire_lock (osb, OCFS_DLM_EXCLUSIVE_LOCK,
+ status = ocfs_acquire_lock (osb, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ tmpstat = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ tmpstat = ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ OCFS_DLM_CACHE_LOCK,
dir_lock_flags,
&old_dir_bh, old_dir,
- OCFS_DLM_EXCLUSIVE_LOCK,
+ OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
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_EXCLUSIVE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
newfe_flags, &newfe_bh,
new_inode);
if (status < 0) {
@@ -1338,12 +1338,12 @@
bail:
if (got_oldlock) {
- ocfs_release_lock(osb, OCFS_DLM_EXCLUSIVE_LOCK,
+ ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
oldfe_flags, NULL, old_inode);
}
if (got_newlock) {
- ocfs_release_lock(osb, OCFS_DLM_EXCLUSIVE_LOCK,
+ ocfs_release_lock(osb, OCFS_DLM_CACHE_LOCK,
newfe_flags, NULL, new_inode);
}
@@ -2021,7 +2021,7 @@
ocfs_handle_add_inode(handle, orphan_dir_inode);
/* disk lock orphan dir here. */
- status = ocfs_acquire_lock(osb, OCFS_DLM_EXCLUSIVE_LOCK,
+ status = ocfs_acquire_lock(osb, OCFS_DLM_CACHE_LOCK,
FLAG_FILE_CREATE | FLAG_DIR,
&orphan_dir_bh, orphan_dir_inode);
if (status < 0) {
More information about the Ocfs2-commits
mailing list