[Ocfs2-commits] khackel commits r1385 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Aug 25 16:48:54 CDT 2004
Author: khackel
Date: 2004-08-25 16:48:53 -0500 (Wed, 25 Aug 2004)
New Revision: 1385
Modified:
trunk/src/alloc.c
trunk/src/dir.c
trunk/src/dlm.c
trunk/src/journal.c
trunk/src/namei.c
Log:
callers of ocfs_acquire_lock required to provide their own bh now
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-08-25 21:07:12 UTC (rev 1384)
+++ trunk/src/alloc.c 2004-08-25 21:48:53 UTC (rev 1385)
@@ -231,6 +231,7 @@
struct inode *vol_inode = NULL;
__u32 tmp_indx;
struct buffer_head *globalbh = NULL;
+ struct buffer_head *tmpbh = NULL;
ocfs_journal_handle *handle = NULL;
int credits = 33; /* one for each potential sysfile fe. This
* goes away when ocfs_ugly_hack goes
@@ -363,8 +364,12 @@
status = ocfs_acquire_lock (osb,
OCFS_LKM_EXMODE,
0,
- NULL,
+ &tmpbh,
inode_alloc_inode[i]);
+ if (tmpbh) {
+ brelse(tmpbh);
+ tmpbh = NULL;
+ }
if (status < 0) {
iput(inode_alloc_inode[i]);
inode_alloc_inode[i] = NULL;
@@ -392,8 +397,12 @@
status = ocfs_acquire_lock (osb,
OCFS_LKM_EXMODE,
0,
- NULL,
+ &tmpbh,
ext_alloc_inode[i]);
+ if (tmpbh) {
+ brelse(tmpbh);
+ tmpbh = NULL;
+ }
if (status < 0) {
iput(ext_alloc_inode[i]);
ext_alloc_inode[i] = NULL;
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-08-25 21:07:12 UTC (rev 1384)
+++ trunk/src/dir.c 2004-08-25 21:48:53 UTC (rev 1385)
@@ -73,6 +73,7 @@
unsigned long offset, blk;
int i, num, stored;
struct buffer_head * bh, * tmp;
+ struct buffer_head * lockbh = NULL;
struct ocfs2_dir_entry * de;
int err;
struct inode *inode = filp->f_dentry->d_inode;
@@ -93,7 +94,11 @@
down_write(&OCFS_I(inode)->ip_io_sem);
error = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
- FLAG_DIR|FLAG_READONLY, NULL, inode);
+ FLAG_DIR|FLAG_READONLY, &lockbh, inode);
+ if (lockbh) {
+ brelse(lockbh);
+ lockbh = NULL;
+ }
if (error < 0) {
if (error != -EINTR)
LOG_ERROR_STATUS (error);
Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c 2004-08-25 21:07:12 UTC (rev 1384)
+++ trunk/src/dlm.c 2004-08-25 21:48:53 UTC (rev 1385)
@@ -184,9 +184,6 @@
__u32 updated;
ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);
int k = 0;
- struct buffer_head *tmpbh = NULL, **b = NULL;
- /* TODO: 40 bytes of "int" sitting on the stack for now. move */
- /* mutually exclusive flags into an enum and switch on them */
int no_owner = 0, owner_dead = 0, wait_on_recovery = 0;
__u32 extra_lock_flags = 0;
__u64 lock_id;
@@ -196,19 +193,15 @@
OCFS_ASSERT(lock_type != OCFS_LKM_NLMODE);
OCFS_ASSERT(inode);
+ OCFS_ASSERT(bh);
lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
LOG_TRACE_ARGS("lock_id = %llu\n", lock_id);
- if (bh != NULL)
- b = bh;
- else
- b = &tmpbh;
-
flags |= FLAG_ACQUIRE_LOCK;
- *b = sb_getblk(osb->sb, OCFS_I(inode)->ip_blkno);
- if (*b == NULL) {
+ *bh = sb_getblk(osb->sb, OCFS_I(inode)->ip_blkno);
+ if (*bh == NULL) {
status = -EIO;
LOG_ERROR_STATUS(status);
goto finally;
@@ -221,7 +214,7 @@
LOG_TRACE_ARGS("attempting to get lock, pass: %d\n", ++k);
if (!updated) {
- status = ocfs_update_lockres(osb, *b, 0, inode, 1, 1);
+ status = ocfs_update_lockres(osb, *bh, 0, inode, 1, 1);
if (status < 0) {
ocfs_release_lockres (lockres);
LOG_ERROR_STATUS (status);
@@ -361,7 +354,7 @@
status = -EINTR;
goto finally;
}
- status = new_lock_function(osb, lock_type, flags|extra_lock_flags, *b, inode);
+ status = new_lock_function(osb, lock_type, flags|extra_lock_flags, *bh, inode);
if (status < 0) {
ocfs_release_lockres (lockres); // ocfs_acquire_lock
@@ -398,8 +391,6 @@
ocfs_release_lockres (lockres); // ocfs_acquire_lock
finally:
- if (tmpbh)
- brelse(tmpbh);
LOG_EXIT_STATUS (status);
return status;
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-08-25 21:07:12 UTC (rev 1384)
+++ trunk/src/journal.c 2004-08-25 21:48:53 UTC (rev 1385)
@@ -1592,6 +1592,7 @@
struct inode *orphan_dir_inode = NULL;
unsigned long offset, blk, local;
struct buffer_head *bh = NULL;
+ struct buffer_head *lockbh = NULL;
struct ocfs2_dir_entry *de;
struct super_block *sb = osb->sb;
@@ -1610,8 +1611,12 @@
status = ocfs_acquire_lock(osb,
OCFS_LKM_EXMODE,
FLAG_DIR|FLAG_READONLY,
- NULL,
+ &lockbh,
orphan_dir_inode);
+ if (lockbh) {
+ brelse(lockbh);
+ lockbh = NULL;
+ }
if (status < 0) {
LOG_ERROR_STATUS(status);
goto bail;
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-08-25 21:07:12 UTC (rev 1384)
+++ trunk/src/namei.c 2004-08-25 21:48:53 UTC (rev 1385)
@@ -975,6 +975,7 @@
struct buffer_head *old_inode_de_bh = NULL; // if old_dentry is a dir,
// this is the 1st dirent bh
nlink_t old_dir_nlink = old_dir->i_nlink, new_dir_nlink = new_dir->i_nlink;
+ struct buffer_head *lockbh = NULL;
LOG_SET_CONTEXT(RENAME);
@@ -1050,7 +1051,11 @@
oldfe_flags = FLAG_RELEASE_DENTRY|FLAG_FILE_RENAME|FLAG_DIR;
status = ocfs_acquire_lock(osb, OCFS_LKM_EXMODE,
- oldfe_flags, NULL, old_inode);
+ oldfe_flags, &lockbh, old_inode);
+ if (lockbh) {
+ brelse(lockbh);
+ lockbh = NULL;
+ }
if (status < 0) {
LOG_ERROR_STATUS(status);
goto finally;
More information about the Ocfs2-commits
mailing list