[Ocfs2-commits] smushran commits r1504 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Sep 28 18:05:37 CDT 2004
Author: smushran
Date: 2004-09-28 18:05:36 -0500 (Tue, 28 Sep 2004)
New Revision: 1504
Modified:
trunk/src/dlm.c
trunk/src/lockres.c
trunk/src/namei.c
trunk/src/nm.c
Log:
lockid now in units of blocks rather than bytes
Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c 2004-09-28 01:24:50 UTC (rev 1503)
+++ trunk/src/dlm.c 2004-09-28 23:05:36 UTC (rev 1504)
@@ -219,7 +219,7 @@
OCFS_ASSERT(inode);
OCFS_ASSERT(bh);
- lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
+ lock_id = OCFS_I(inode)->ip_blkno;
LOG_TRACE_ARGS("lock_id = %llu\n", lock_id);
flags |= FLAG_ACQUIRE_LOCK;
@@ -256,7 +256,7 @@
if (unlikely(lockres->master_node_num >= osb->max_nodes && !no_owner)) {
LOG_ERROR_ARGS("lockres: master_node=%d, owner=%s, lockid=%llu\n",
lockres->master_node_num, no_owner?"no":"yes",
- OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits);
+ lock_id);
LOG_ERROR_STATUS (status = -EINVAL);
ocfs_release_lockres_write (inode); // ocfs_acquire_lock
goto finally;
@@ -354,10 +354,8 @@
#ifdef VERBOSE_LOCKING_TRACE
printk("acquire_lock: lockid=%llu, this=%d, master=%d, locktype=%d, "
- "flags=%08x, readonly=%s\n",
- OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
- osb->node_num, lockres->master_node_num, lockres->lock_type,
- flags|extra_lock_flags,
+ "flags=%08x, readonly=%s\n", lock_id, osb->node_num,
+ lockres->master_node_num, lockres->lock_type, flags|extra_lock_flags,
test_bit(LOCK_STATE_READONLY, &lockres->readonly_state) ? "yes" : "no");
#endif
if (wait_on_recovery
@@ -387,11 +385,8 @@
ocfs_release_lockres_write (inode); // ocfs_acquire_lock
if (status == -EAGAIN || status == -ETIMEDOUT) {
if (status == -ETIMEDOUT)
- LOG_ERROR_ARGS("Timed out acquiring lock for "
- "inode %llu, (lockid = %llu) "
- "retrying...\n",
- OCFS_I(inode)->ip_blkno,
- lock_id);
+ LOG_ERROR_ARGS("Timed out acquiring lock for inode "
+ "%llu, retrying...\n", OCFS_I(inode)->ip_blkno);
ocfs_sleep (50);
ocfs_acquire_lockres_write(inode);
/* if we're going to jump back up, we want to update
@@ -450,7 +445,7 @@
OCFS_ASSERT(inode);
OCFS_ASSERT(num_ident);
- lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
+ lock_id = OCFS_I(inode)->ip_blkno;
LOG_TRACE_ARGS("lock_id = %llu", lock_id);
flags |= FLAG_RELEASE_LOCK;
@@ -571,7 +566,7 @@
LOG_ENTRY ();
- lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
+ lock_id = OCFS_I(inode)->ip_blkno;
if (flags & FLAG_READONLY) {
if (flags & (FLAG_CHANGE_MASTER | FLAG_REMASTER)) {
@@ -638,9 +633,9 @@
goto vote_success;
}
- status = ocfs_send_dlm_request_msg (osb, lock_id, lock_type,
- flags, &vote_map,
- inode, 1,
+ status = ocfs_send_dlm_request_msg (osb, lock_id, lock_type,
+ flags, &vote_map,
+ inode, 1,
&vote_status);
if (status >= 0) {
status = vote_status;
@@ -686,7 +681,8 @@
/* want to refresh the lock from the latest on disk
* state before writing it back out. */
- status = ocfs_read_bh(osb, lock_id, &bh, 0, inode);
+ status = ocfs_read_bh(osb, lock_id << inode->i_sb->s_blocksize_bits,
+ &bh, 0, inode);
if (!status)
ocfs_update_disk_lock(osb, bh, inode);
Modified: trunk/src/lockres.c
===================================================================
--- trunk/src/lockres.c 2004-09-28 01:24:50 UTC (rev 1503)
+++ trunk/src/lockres.c 2004-09-28 23:05:36 UTC (rev 1504)
@@ -67,8 +67,7 @@
ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);
LOG_ENTRY_ARGS("(0x%p, %llu, 0x%p, 0x%p)\n", osb,
- OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
- lockres, bh);
+ OCFS_I(inode)->ip_blkno, lockres, bh);
/* hey, you can't do that! ;) */
if ((!bh) && !reread)
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-09-28 01:24:50 UTC (rev 1503)
+++ trunk/src/namei.c 2004-09-28 23:05:36 UTC (rev 1504)
@@ -893,8 +893,8 @@
OCFS_ASSERT(handle);
- id1 = OCFS_I(inode1)->ip_blkno << inode1->i_sb->s_blocksize_bits;
- id2 = OCFS_I(inode2)->ip_blkno << inode2->i_sb->s_blocksize_bits;
+ id1 = OCFS_I(inode1)->ip_blkno;
+ id2 = OCFS_I(inode2)->ip_blkno;
if (*bh1)
*bh1 = NULL;
Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c 2004-09-28 01:24:50 UTC (rev 1503)
+++ trunk/src/nm.c 2004-09-28 23:05:36 UTC (rev 1504)
@@ -195,7 +195,7 @@
OCFS_ASSERT(inode);
OCFS_ASSERT(lockres);
- lockid = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
+ lockid = OCFS_I(inode)->ip_blkno;
*change_master = 0;
*write_lock = 0;
@@ -501,15 +501,13 @@
vote_response = FLAG_VOTE_UPDATE_RETRY;
if (flags & FLAG_TRUNCATE_PAGES) {
- inode = ocfs_ilookup(osb,
- lock_id >> osb->sb->s_blocksize_bits);
+ inode = ocfs_ilookup(osb, lock_id);
if(!inode) {
vote_type = TRUNCATE_PAGES;
goto got_vote_type;
}
} else {
- inode = ocfs_iget(osb,
- lock_id >> osb->sb->s_blocksize_bits);
+ inode = ocfs_iget(osb, lock_id);
}
if (!inode) {
@@ -541,7 +539,7 @@
if (status < 0) {
LOG_TRACE_ARGS("Timedout locking lockres for id: %llu\n",
- OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits);
+ OCFS_I(inode)->ip_blkno);
goto vote;
} else
lockres_lock_held = (write_lock ? WRITE_LOCK : READ_LOCK);
@@ -728,8 +726,7 @@
/* requestor will need to retry if anyone is using the lockres */
if (lockres->lock_holders > 0) {
LOG_TRACE_PROCESS_VOTE("Lock id (%llu) has %u holders\n",
- OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
- lockres->lock_holders);
+ OCFS_I(inode)->ip_blkno, lockres->lock_holders);
// kick the commit thread
atomic_set(&osb->flush_event_woken, 1);
wake_up(&osb->flush_event);
@@ -795,8 +792,8 @@
BUG();
}
- *status = ocfs_read_bh(osb, lock_id, &fe_bh, OCFS_BH_CACHED,
- inode);
+ *status = ocfs_read_bh(osb, (lock_id << osb->sb->s_blocksize_bits),
+ &fe_bh, OCFS_BH_CACHED, inode);
if (*status < 0) {
LOG_ERROR_STATUS ((*status));
return *status;
More information about the Ocfs2-commits
mailing list