[Ocfs2-commits] khackel commits r1384 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Aug 25 16:07:13 CDT 2004
Author: khackel
Date: 2004-08-25 16:07:12 -0500 (Wed, 25 Aug 2004)
New Revision: 1384
Modified:
trunk/src/dir.c
trunk/src/dlm.c
trunk/src/journal.c
trunk/src/nm.c
trunk/src/ocfs.h
Log:
simple readonly changes
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-08-25 01:49:03 UTC (rev 1383)
+++ trunk/src/dir.c 2004-08-25 21:07:12 UTC (rev 1384)
@@ -93,7 +93,7 @@
down_write(&OCFS_I(inode)->ip_io_sem);
error = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
- FLAG_DIR|FLAG_READDIR, NULL, inode);
+ FLAG_DIR|FLAG_READONLY, NULL, inode);
if (error < 0) {
if (error != -EINTR)
LOG_ERROR_STATUS (error);
@@ -202,7 +202,7 @@
if (have_disk_lock) {
error = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
- FLAG_DIR|FLAG_READDIR, inode);
+ FLAG_DIR|FLAG_READONLY, inode);
if (error < 0)
LOG_ERROR_STATUS (error);
}
@@ -236,7 +236,7 @@
if (take_lock) {
/* Get a lock on the directory... */
status = ocfs_acquire_lock (osb, OCFS_LKM_EXMODE,
- FLAG_DIR|FLAG_READDIR,
+ FLAG_DIR|FLAG_READONLY,
&bh, inode);
if (status < 0) {
/* Volume should be disabled in this case */
@@ -261,7 +261,7 @@
if (take_lock && lock_acq)
{
tmpstat = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
- FLAG_DIR|FLAG_READDIR, inode);
+ FLAG_DIR|FLAG_READONLY, inode);
if (tmpstat < 0) {
LOG_ERROR_STATUS (tmpstat);
/* Volume should be disabled in this case */
Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c 2004-08-25 01:49:03 UTC (rev 1383)
+++ trunk/src/dlm.c 2004-08-25 21:07:12 UTC (rev 1384)
@@ -260,7 +260,7 @@
status = 0;
extra_lock_flags = 0;
- if (flags & FLAG_READDIR) {
+ if (flags & FLAG_READONLY) {
if (lockres->readonly_node != OCFS_INVALID_NODE_NUM)
goto skip_lock_write;
if (lockres->master_node_num == osb->node_num &&
@@ -288,7 +288,7 @@
goto do_lock;
}
- // anything else is NOT a readdir request
+ // anything else is NOT a readonly request
if (lockres->readonly_node != osb->node_num)
lockres->readonly_node = OCFS_INVALID_NODE_NUM; // clear any owner
@@ -439,11 +439,11 @@
goto finally;
}
- if (flags & FLAG_READDIR) {
+ if (flags & FLAG_READONLY) {
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",
+ LOG_ERROR_ARGS("READONLY release has issues! type=%d, master=%d, ronode=%d\n",
lockres->lock_type, lockres->master_node_num, lockres->readonly_node);
status = 0;
goto finally;
@@ -531,7 +531,7 @@
__u32 lock_write_flags = DLOCK_FLAG_MASTER | DLOCK_FLAG_LOCK;
__u32 lock_type = requested_lock;
int need_to_zap_buffers = 0, need_lock_write = 1;
- int is_readdir = (flags & FLAG_READDIR) ? 1 : 0;
+ int is_readonly = (flags & FLAG_READONLY) ? 1 : 0;
int status = 0, vote_status = 0;
ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);
@@ -539,13 +539,13 @@
lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
- if (flags & FLAG_READDIR) {
+ if (flags & FLAG_READONLY) {
if (flags & (FLAG_CHANGE_MASTER | FLAG_REMASTER)) {
/* there is no readonly_node. treat like normal change master. */
- flags &= ~FLAG_READDIR;
+ flags &= ~FLAG_READONLY;
}
} else if (flags & FLAG_CHANGE_MASTER) {
- /* non-readdir with CHANGE_MASTER should have no readonly_node */
+ /* non-readonly with CHANGE_MASTER should have no readonly_node */
if (lockres->readonly_node != OCFS_INVALID_NODE_NUM) {
LOG_ERROR_ARGS("change_master but readonly_node was %d\n",
lockres->readonly_node);
@@ -559,7 +559,7 @@
} else if (flags & (FLAG_DROP_READONLY | FLAG_TRUNCATE_PAGES)) {
need_lock_write = 0;
need_to_zap_buffers = 0;
- } else if (flags & FLAG_READDIR) {
+ } else if (flags & FLAG_READONLY) {
need_lock_write = 0;
need_to_zap_buffers = 1;
} else if (!bh) {
@@ -637,7 +637,7 @@
}
/* converted cachelock to readonly cachelock */
- if (flags & FLAG_READDIR) {
+ if (flags & FLAG_READONLY) {
lockres->readonly_node = lockres->master_node_num;
goto bail;
}
@@ -652,8 +652,8 @@
}
bail:
- /* if we removed FLAG_READDIR above, set the readonly_node now */
- if (is_readdir && !(flags & FLAG_READDIR)) {
+ /* if we removed FLAG_READONLY above, set the readonly_node now */
+ if (is_readonly && !(flags & FLAG_READONLY)) {
lockres->readonly_node = lockres->master_node_num;
}
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-08-25 01:49:03 UTC (rev 1383)
+++ trunk/src/journal.c 2004-08-25 21:07:12 UTC (rev 1384)
@@ -1609,7 +1609,7 @@
down_write(&OCFS_I(orphan_dir_inode)->ip_io_sem);
status = ocfs_acquire_lock(osb,
OCFS_LKM_EXMODE,
- FLAG_DIR|FLAG_READDIR,
+ FLAG_DIR|FLAG_READONLY,
NULL,
orphan_dir_inode);
if (status < 0) {
@@ -1689,7 +1689,7 @@
}
status = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
- FLAG_DIR|FLAG_READDIR, orphan_dir_inode);
+ FLAG_DIR|FLAG_READONLY, orphan_dir_inode);
have_disk_lock = 0;
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -1711,7 +1711,7 @@
if (have_disk_lock) {
tmpstat = ocfs_release_lock (osb, OCFS_LKM_EXMODE,
- FLAG_DIR|FLAG_READDIR,
+ FLAG_DIR|FLAG_READONLY,
orphan_dir_inode);
if (tmpstat < 0)
LOG_ERROR_STATUS(tmpstat);
Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c 2004-08-25 01:49:03 UTC (rev 1383)
+++ trunk/src/nm.c 2004-08-25 21:07:12 UTC (rev 1384)
@@ -335,7 +335,7 @@
if (flags & FLAG_DROP_READONLY) {
vote_type = DROP_READONLY;
goto done;
- } else if (flags & FLAG_READDIR) {
+ } else if (flags & FLAG_READONLY) {
if (lockres->master_node_num == osb->node_num &&
lockres->lock_type == OCFS_LKM_EXMODE) {
vote_type = READONLY;
@@ -982,7 +982,7 @@
if (lockres->lock_holders > 0) {
#ifdef VERBOSE_PROCESS_VOTE
- printk("process_vote: (readdir) Lock id (%llu) has %u "
+ printk("process_vote: (readonly) Lock id (%llu) has %u "
"holders\n",
OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
lockres->lock_holders);
@@ -996,7 +996,7 @@
break;
}
- // if the requestor just wants to do readdir, we
+ // if the requestor just wants to do readonly, we
// drop our buffers, so switch to readonly and done
sync_mapping_buffers(inode->i_mapping);
Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h 2004-08-25 01:49:03 UTC (rev 1383)
+++ trunk/src/ocfs.h 2004-08-25 21:07:12 UTC (rev 1384)
@@ -134,7 +134,7 @@
#define FLAG_TRUNCATE_PAGES 0x00001000
#define FLAG_FILE_TRUNCATE 0x00002000
#define FLAG_DROP_READONLY 0x00004000
-#define FLAG_READDIR 0x00008000
+#define FLAG_READONLY 0x00008000
#define FLAG_FILE_UNUSED01 0x00010000
#define FLAG_FILE_UNUSED02 0x00020000
#define FLAG_FILE_UNUSED03 0x00040000
More information about the Ocfs2-commits
mailing list