[Ocfs2-commits] manish commits r1135 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Jun 17 18:44:55 CDT 2004
Author: manish
Date: 2004-06-17 17:44:53 -0500 (Thu, 17 Jun 2004)
New Revision: 1135
Modified:
trunk/src/alloc.c
trunk/src/bitmap.c
trunk/src/buffer_head_io.c
trunk/src/buffer_head_io.h
trunk/src/dir.c
trunk/src/dlm.c
trunk/src/file.c
trunk/src/heartbeat.c
trunk/src/inode.c
trunk/src/journal.c
trunk/src/lockres.c
trunk/src/namei.c
trunk/src/nm.c
trunk/src/super.c
trunk/src/volcfg.c
Log:
Get rid of OCFS_BH_PUT_DATA
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/alloc.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -404,7 +404,6 @@
bm_lock = OCFS_BH_GET_DATA_WRITE(globalbh);
bm_lock->id1.bitmap1.i_used =
ocfs_count_bits(osb->sb, &osb->cluster_bitmap);
- OCFS_BH_PUT_DATA(globalbh);
status = ocfs_journal_dirty(handle, globalbh);
if (status < 0) {
@@ -709,7 +708,6 @@
buff = OCFS_BH_GET_DATA_WRITE(eb_bhs[i]);
memset(buff, 0, osb->sb->s_blocksize);
set_buffer_uptodate(eb_bhs[i]);
- OCFS_BH_PUT_DATA(eb_bhs[i]);
}
k = el1->l_next_free_rec;
@@ -750,7 +748,6 @@
}
parent_blk = eb->h_blkno;
- OCFS_BH_PUT_DATA(eb_bhs[i]);
}
for(i = 0; i < new_blocks; i++) {
@@ -766,7 +763,6 @@
u64 tmp_blk = eb->h_parent_blk;
int tree_depth = el1->l_tree_depth;
- OCFS_BH_PUT_DATA(eb_bh);
bh_locked = 0;
eb = NULL;
@@ -800,7 +796,6 @@
eb = OCFS_BH_GET_DATA_WRITE(bh);
if (!IS_VALID_EXTENT_BLOCK(eb)) {
- OCFS_BH_PUT_DATA(bh);
brelse(bh);
LOG_ERROR_STATUS (status = -EINVAL);
goto finally;
@@ -808,7 +803,6 @@
el2 = &eb->h_list;
if (el2->l_next_free_rec == 0) {
- OCFS_BH_PUT_DATA(bh);
brelse(bh);
LOG_ERROR_STATUS (status = -EFAIL);
goto finally;
@@ -818,7 +812,6 @@
el2->l_recs[k].e_clusters += new_clusters;
tmp_blk = eb->h_parent_blk;
- OCFS_BH_PUT_DATA(bh);
status = ocfs_journal_dirty(handle, bh);
if (status < 0) {
@@ -833,8 +826,6 @@
el1->l_recs[k].e_clusters += new_clusters;
}
finally:
- if (bh_locked)
- OCFS_BH_PUT_DATA(eb_bh);
if (eb_bhs) {
for (i = 0; i < new_blocks; i++)
if (eb_bhs[i])
@@ -872,7 +863,7 @@
new_clusters);
fe = (ocfs2_dinode *) fe_bh->b_data;
-
+
fel = &fe->id2.i_list;
numbhs = fel->l_tree_depth + 2;
@@ -907,7 +898,6 @@
buf = OCFS_BH_GET_DATA_WRITE(bhs[i]);
memset(buf, 0, osb->sb->s_blocksize);
set_buffer_uptodate(bhs[i]);
- OCFS_BH_PUT_DATA(bhs[i]);
}
if (phys_blkno == 0) {
@@ -936,8 +926,6 @@
LOG_TRACE_ARGS ("Tree depth is: %d\n", fel->l_tree_depth);
- OCFS_BH_PUT_DATA(bhs[0]);
-
/* If tree_depth is zero now, the for loop will not execute. */
/* First time a file is created, tree_depth = -1 */
@@ -981,7 +969,6 @@
parent_blk = last_eb_blkno = eb2->h_blkno;
}
- OCFS_BH_PUT_DATA(bhs[i]);
}
/* Update the Data Segment, which is the last one in our array */
@@ -1015,8 +1002,6 @@
eb1->h_next_leaf_blk = 0;
parent_blk = last_eb_blkno = eb1->h_blkno;
-
- OCFS_BH_PUT_DATA(bhs[fel->l_tree_depth]);
/* This needs to be a sync write OR journalled to be safe. */
status = ocfs_write_bhs(osb, bhs, numbhs, 0, inode);
@@ -1048,14 +1033,12 @@
eb1 = OCFS_BH_GET_DATA_WRITE(bh);
if (!IS_VALID_EXTENT_BLOCK(eb1) ||
(eb1->h_list.l_tree_depth != -1)) {
- OCFS_BH_PUT_DATA(bh);
brelse(bh);
LOG_ERROR_STATUS (status = -EINVAL);
goto finally;
}
eb1->h_next_leaf_blk = last_eb_blkno;
- OCFS_BH_PUT_DATA(bh);
status = ocfs_journal_dirty(handle, bh);
brelse(bh);
@@ -1091,7 +1074,6 @@
eb1 = OCFS_BH_GET_DATA_WRITE(bh);
eb1->h_parent_blk = new_parent_blk;
- OCFS_BH_PUT_DATA(bh);
status = ocfs_journal_dirty(handle, bh);
brelse(bh);
@@ -1118,7 +1100,6 @@
fe->i_last_eb_blk = last_eb_blkno;
finally:
-
#warning Leaking bhs here
LOG_EXIT_STATUS (status);
return (status);
@@ -1223,10 +1204,7 @@
/* See if we can merge the extents and just increase
* the length */
- if (k >= 0 &&
- ocfs_extent_contig(inode, &(el1->l_recs[k]), blkno)) {
- OCFS_BH_PUT_DATA(eb1_bh);
-
+ if (k >= 0 && ocfs_extent_contig(inode, &(el1->l_recs[k]), blkno)) {
status = ocfs_journal_access(handle, eb1_bh,
OCFS_JOURNAL_ACCESS_WRITE);
if (status < 0) {
@@ -1248,8 +1226,6 @@
if (k != el1->l_count) {
/* we can just add next extent */
- OCFS_BH_PUT_DATA(eb1_bh);
-
status = ocfs_journal_access(handle, eb1_bh,
OCFS_JOURNAL_ACCESS_WRITE);
if (status < 0) {
@@ -1278,7 +1254,6 @@
for (i = 0; i < fel->l_tree_depth; i++) {
/* if we loop back around */
if (eb2) {
- OCFS_BH_PUT_DATA(eb2_bh);
brelse(eb2_bh);
eb2 = NULL;
el2 = NULL;
@@ -1314,7 +1289,6 @@
} /* for (i = 0; i < fe->i_tree_depth; i++) */
if (eb2) {
- OCFS_BH_PUT_DATA(eb2_bh);
eb2 = NULL;
el2 = NULL;
/* we may still need the bh so don't brelse */
@@ -1341,8 +1315,6 @@
goto finally;
}
- OCFS_BH_PUT_DATA(eb1_bh);
-
status = ocfs_journal_access(handle, eb1_bh,
OCFS_JOURNAL_ACCESS_WRITE);
if (status < 0) {
@@ -1361,7 +1333,6 @@
parent_blk = eb1->h_parent_blk;
/* gotta put it away to write it ;) */
- OCFS_BH_PUT_DATA(eb1_bh);
eb1 = NULL;
status = ocfs_journal_dirty(handle, eb1_bh);
if (status < 0) {
@@ -1375,7 +1346,6 @@
/* next two if's are for loop around */
if (eb2_bh) {
if (eb2) {
- OCFS_BH_PUT_DATA(eb2_bh);
eb2 = NULL;
el2 = NULL;
}
@@ -1420,7 +1390,6 @@
/* gonna need it if we loop around */
parent_blk = eb2->h_parent_blk;
- OCFS_BH_PUT_DATA(eb2_bh);
eb2 = NULL;
el2 = NULL;
@@ -1442,15 +1411,12 @@
increase_depth:
if (IncreaseTreeDepth) {
- OCFS_BH_PUT_DATA(fe_bh);
fe = NULL;
if (eb1_bh && eb1) {
- OCFS_BH_PUT_DATA(eb1_bh);
eb1 = NULL;
el1 = NULL;
}
if (eb2_bh && eb2) {
- OCFS_BH_PUT_DATA(eb2_bh);
eb2 = NULL;
el2 = NULL;
}
@@ -1491,19 +1457,12 @@
* non-null if they have.
* Buffer heads are non-NULL if they need to be brelsed */
if (eb1_bh) {
- if (eb1)
- OCFS_BH_PUT_DATA(eb1_bh);
brelse(eb1_bh);
}
if (eb2_bh) {
- if (eb2)
- OCFS_BH_PUT_DATA(eb2_bh);
brelse(eb2_bh);
}
- if (fe) {
- OCFS_BH_PUT_DATA(fe_bh);
- }
LOG_EXIT_STATUS (status);
return (status);
@@ -1640,7 +1599,6 @@
stack[tos] = kmalloc(osb->sb->s_blocksize, GFP_KERNEL);
memcpy(stack[tos], OCFS_BH_GET_DATA_READ(extent_grp_bh),
osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(extent_grp_bh);
do {
cur_eb = (ocfs2_extent_block *) stack[tos];
@@ -1708,7 +1666,6 @@
memcpy(stack[tos],
OCFS_BH_GET_DATA_READ(tmp_bh),
osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(tmp_bh);
brelse(tmp_bh);
tmp_bh = NULL;
/* We only want to free on our way back up the tree */
@@ -1749,7 +1706,7 @@
struct buffer_head *eb_bh,
struct inode *inode)
{
- ocfs2_extent_block *eb = NULL;
+ ocfs2_extent_block *eb;
ocfs2_extent_list *el;
int status = -EFAIL;
int i;
@@ -1776,14 +1733,8 @@
el->l_recs[i].e_cpos = 0;
}
- OCFS_BH_PUT_DATA(eb_bh);
- eb = NULL;
-
- status=0;
+ status = 0;
bail:
- if (eb)
- OCFS_BH_PUT_DATA(eb_bh);
-
LOG_EXIT_STATUS (status);
return(status);
}
@@ -1848,7 +1799,6 @@
&tmp_bh2,
OCFS_BH_COND_CACHED, inode);
if (status < 0) {
- OCFS_BH_PUT_DATA(eb_bh);
eb = NULL;
brelse(tmp_bh2);
LOG_ERROR_STATUS (status);
@@ -1862,7 +1812,6 @@
handle,
inode);
if (status < 0) {
- OCFS_BH_PUT_DATA(eb_bh);
eb = NULL;
el = NULL;
brelse(tmp_bh2);
@@ -1881,7 +1830,6 @@
}
/* Write out our new top of the tree duder */
- OCFS_BH_PUT_DATA(eb_bh);
eb = NULL;
el = NULL;
@@ -1931,7 +1879,6 @@
OCFS_BH_COND_CACHED,
inode);
if (status < 0) {
- OCFS_BH_PUT_DATA(eb_bh);
eb = NULL;
el = NULL;
brelse(tmp_bh);
@@ -1946,7 +1893,6 @@
handle,
inode);
if (status < 0) {
- OCFS_BH_PUT_DATA(eb_bh);
eb = NULL;
el = NULL;
brelse(tmp_bh);
@@ -1964,7 +1910,6 @@
}
}
/* Write out our new top of the tree duder */
- OCFS_BH_PUT_DATA(eb_bh);
eb = NULL;
el = NULL;
@@ -2022,7 +1967,6 @@
/* Boundary case - what if this guy is
* the last DAT we should delete
* (i.e., split no more ;) */
- OCFS_BH_PUT_DATA(bh_stack[tos]);
alloc_eb = NULL;
el = NULL;
status = ocfs_kill_this_tree(osb,
@@ -2112,7 +2056,6 @@
} /* For loop */
/* Either way, we need to write this back out*/
- OCFS_BH_PUT_DATA(bh_stack[tos]);
alloc_eb = NULL;
el = NULL;
@@ -2144,7 +2087,6 @@
rec = &el->l_recs[victim];
rec->e_clusters -=
(u32)(total_bytes >> osb->s_clustersize_bits);
- OCFS_BH_PUT_DATA(bh_stack[tos]);
alloc_eb = NULL;
el = NULL;
status = ocfs_fix_extent_block(osb,
@@ -2179,7 +2121,6 @@
LOG_ERROR_STATUS (status);
goto bail;
}
- OCFS_BH_PUT_DATA(bh_stack[tos]);
brelse(bh_stack[tos]);
alloc_eb = NULL;
el = NULL;
@@ -2196,7 +2137,6 @@
if (el->l_recs[0].e_cpos == fe->i_clusters)
done = 1;
- OCFS_BH_PUT_DATA(bh_stack[tos]);
alloc_eb = NULL;
ocfs_kill_this_tree(osb, bh_stack[tos],
handle, inode);
@@ -2228,7 +2168,6 @@
el->l_recs[victim].e_clusters = 0;
el->l_recs[victim].e_blkno = 0;
el->l_next_free_rec--;
- OCFS_BH_PUT_DATA(bh_stack[tos]);
alloc_eb = NULL;
el = NULL;
/* Here's an interesting boundary
@@ -2281,7 +2220,6 @@
victim = el->l_next_free_rec;
rec = &el->l_recs[victim];
tmp_off = rec->e_blkno << osb->sb->s_blocksize_bits;
- OCFS_BH_PUT_DATA(bh_stack[tos]);
alloc_eb = NULL;
el = NULL;
@@ -2311,8 +2249,6 @@
/* We only want to free on our way up the tree */
continue;
}
- if (alloc_eb)
- OCFS_BH_PUT_DATA(bh_stack[tos]);
brelse(bh_stack[tos]);
bh_stack[tos] = NULL;
alloc_eb = NULL;
@@ -2328,8 +2264,6 @@
bail:
/* brelse the stack. We only brelse the bottom of the stack if
* we know for sure that it wasn't passed from the caller */
- if (alloc_eb)
- OCFS_BH_PUT_DATA(bh_stack[tos]);
if (needs_brelse)
brelse(bh_stack[0]);
for(i = 1; i < OCFS_TREE_STACK_SIZE; i++)
@@ -2406,7 +2340,6 @@
next_blk = el->l_recs[el->l_next_free_rec - 1].e_blkno;
- OCFS_BH_PUT_DATA(eb_bh);
brelse(eb_bh);
eb = NULL;
eb_bh = NULL;
@@ -2425,11 +2358,8 @@
fe->i_last_eb_blk = eb->h_blkno;
status = 0;
bail:
- if (eb_bh) {
- if (eb)
- OCFS_BH_PUT_DATA(eb_bh);
+ if (eb_bh)
brelse(eb_bh);
- }
LOG_EXIT_STATUS(status);
return(status);
@@ -2728,7 +2658,6 @@
next_leaf = eb->h_next_leaf_blk;
- OCFS_BH_PUT_DATA(eb_bh);
brelse(eb_bh);
eb_bh = NULL;
eb = NULL;
@@ -2778,17 +2707,12 @@
if (have_io_sem)
up_read(&OCFS_I(inode)->ip_io_sem);
- if (fe_bh) {
- if (fe)
- OCFS_BH_PUT_DATA(fe_bh);
+ if (fe_bh)
brelse(fe_bh);
- }
- if (eb_bh) {
- if (eb)
- OCFS_BH_PUT_DATA(eb_bh);
+ if (eb_bh)
brelse(eb_bh);
- }
+
LOG_EXIT_STATUS (status);
return (status);
} /* ocfs_lookup_file_allocation */
@@ -2848,7 +2772,6 @@
}
}
- OCFS_BH_PUT_DATA(ext_bh);
brelse(ext_bh);
ext_bh = NULL;
eb = NULL;
@@ -2870,19 +2793,14 @@
if (!IS_VALID_EXTENT_BLOCK(tmp) ||
(tmp->h_list.l_tree_depth != -1)) {
LOG_ERROR_STATUS (status = -EINVAL);
- OCFS_BH_PUT_DATA(*data_extent_bh);
brelse(*data_extent_bh);
*data_extent_bh = NULL;
goto finally;
}
- OCFS_BH_PUT_DATA(*data_extent_bh);
finally:
- if (ext_bh) {
- if (eb)
- OCFS_BH_PUT_DATA(ext_bh);
+ if (ext_bh)
brelse(ext_bh);
- }
LOG_EXIT_STATUS (status);
return (status);
@@ -2920,7 +2838,7 @@
static __u32 LargeAllocOffset = 0;
static __u32 SmallAllocOffset = 0;
struct buffer_head *bh = NULL;
- ocfs2_dinode *bm_lock = NULL;
+ ocfs2_dinode *bm_lock;
__u32 bitmapblocks; /* we only care about the valid blocks */
int local_lock = 0;
int local_inode = 0;
@@ -3075,8 +2993,6 @@
/* write the bitmap size info to the lock sector */
bm_lock->id1.bitmap1.i_used =
ocfs_count_bits(osb->sb, &osb->cluster_bitmap);
- OCFS_BH_PUT_DATA(bh);
- bm_lock = NULL;
status = ocfs_journal_dirty(handle, bh);
if (status < 0) {
@@ -3089,9 +3005,6 @@
status = 0;
leave:
- if (bm_lock != NULL)
- OCFS_BH_PUT_DATA(bh);
-
if (local_lock && bh)
brelse(bh);
@@ -3191,10 +3104,7 @@
fe = OCFS_BH_GET_DATA_READ(bh);
prevFileSize = fileSize = fe->i_size;
allocSize = (u64)fe->i_clusters << osb->s_clustersize_bits;
- OCFS_BH_PUT_DATA(bh);
-
-
if ((fileSize != 0) && (allocSize != 0)) {
ocfs_initialize_bitmap(osb->sb, &bitmap,
(__u32)fileSize * 8,
@@ -3239,7 +3149,6 @@
newFileSize, alloc_inode->i_size,
allocSize, OCFS_I(alloc_inode)->alloc_size);
}
- OCFS_BH_PUT_DATA(alloc_bh);
//newFileSize = alloc_inode->i_size;
//allocSize = OCFS_I(alloc_inode)->alloc_size;
@@ -3282,7 +3191,6 @@
allocSize = (u64)fe->i_clusters << osb->s_clustersize_bits;
LOG_TRACE_ARGS("fileSize=%llu, allocSize=%llu\n",
fileSize, allocSize);
- OCFS_BH_PUT_DATA(bh);
if (needs_uninit)
ocfs_reinitialize_bitmap(osb->sb, &bitmap,
@@ -3380,7 +3288,6 @@
fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (offset != (fe->i_blkno << osb->sb->s_blocksize_bits))
BUG();
- OCFS_BH_PUT_DATA(fe_bh);
if (inode)
SET_BH_SEQNUM(inode, fe_bh);
@@ -3418,7 +3325,6 @@
LOG_ERROR_STATUS(status);
goto leave;
}
- OCFS_BH_PUT_DATA(extent_bh);
extent = NULL;
status = ocfs_kill_this_tree(osb, extent_bh, handle, inode);
if (status < 0) {
@@ -3431,13 +3337,9 @@
}
leave:
- if (extent_bh) {
- if (extent)
- OCFS_BH_PUT_DATA(extent_bh);
+ if (extent_bh)
brelse(extent_bh);
- }
- OCFS_BH_PUT_DATA(fe_bh);
LOG_EXIT_STATUS (status);
return status;
} /* ocfs_free_file_extents */
@@ -3637,11 +3539,9 @@
alloc = OCFS_BH_GET_DATA_READ(local_alloc_bh);
if (LOCAL_ALLOC(alloc)->la_bm_bits == 0) {
- OCFS_BH_PUT_DATA(local_alloc_bh);
LOG_TRACE_STR("nothing to sync!");
goto bail;
}
- OCFS_BH_PUT_DATA(local_alloc_bh);
if (!(*f)) {
*f = ocfs_alloc_bitmap_free_head();
@@ -3681,10 +3581,7 @@
bit_off++;
}
- OCFS_BH_PUT_DATA(local_alloc_bh);
-
bail:
-
LOG_EXIT_STATUS(status);
return(status);
} /* ocfs_sync_local_from_shutdown */
@@ -3708,7 +3605,6 @@
if (LOCAL_ALLOC(alloc)->la_bm_bits != 0)
LOG_TRACE_STR("asking me to alloc a new window over a"
" non-empty one");
- OCFS_BH_PUT_DATA(osb->local_alloc_bh);
/* we try to use find_contig_space_from_bitmap here for now. */
alloc_bytes = (u64)ocfs_local_alloc_window_bits(osb) << osb->s_clustersize_bits;
@@ -3745,8 +3641,6 @@
LOG_TRACE_ARGS("window la_bm_bits = %u\n",
LOCAL_ALLOC(alloc)->la_bm_bits);
- OCFS_BH_PUT_DATA(osb->local_alloc_bh);
-
bail:
LOG_EXIT_STATUS(status);
return(status);
@@ -3814,7 +3708,7 @@
__u64 * bitoff, __u64 * bitcount,
ocfs_journal_handle *handle)
{
- ocfs2_dinode *alloc = NULL;
+ ocfs2_dinode *alloc;
int status = 0, tmpstat;
int startoff, tmpoff;
__u32 tmpwanted;
@@ -3845,7 +3739,6 @@
tryagain:
/* If we need to initialize a new window, do so now. */
if (LOCAL_ALLOC(alloc)->la_bm_bits == 0) {
- OCFS_BH_PUT_DATA(osb->local_alloc_bh);
alloc = NULL;
LOG_TRACE_STR("Allocating a new window...");
@@ -3883,7 +3776,6 @@
* clear the local out and try again. */
LOG_TRACE_STR("Could not find enough contiguous bits in local "
"alloc bitmap, trying to move my window.");
- OCFS_BH_PUT_DATA(osb->local_alloc_bh);
alloc = NULL;
if (!main_bm_inode)
@@ -3924,7 +3816,6 @@
ocfs_clear_local_alloc(alloc);
- OCFS_BH_PUT_DATA(osb->local_alloc_bh);
alloc = NULL;
alloc = OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh);
@@ -3948,7 +3839,6 @@
*bitoff = LOCAL_ALLOC(alloc)->la_bm_off + startoff;
*bitcount = bitswanted;
- OCFS_BH_PUT_DATA(osb->local_alloc_bh);
alloc = NULL;
status = ocfs_journal_dirty(handle, osb->local_alloc_bh);
@@ -3958,13 +3848,9 @@
}
bail:
/* if we locked the main bitmap, cleanup after ourselves. */
- if (main_bm_bh) {
+ if (main_bm_bh)
brelse(main_bm_bh);
- }
- if (alloc && osb->local_alloc_bh)
- OCFS_BH_PUT_DATA(osb->local_alloc_bh);
-
if (main_bm_inode)
iput(main_bm_inode);
@@ -4092,7 +3978,6 @@
LOG_TRACE_ARGS("num_used = %u, alloc->la_bits_set = %u!\n",
num_used,
LOCAL_ALLOC(alloc)->la_bits_set);
- OCFS_BH_PUT_DATA(alloc_bh);
status = -EFAIL;
goto bail;
}
@@ -4100,7 +3985,6 @@
osb->local_alloc_bh = alloc_bh;
osb->have_local_alloc = 1;
- OCFS_BH_PUT_DATA(alloc_bh);
bail:
if (status < 0)
if (alloc_bh)
@@ -4157,7 +4041,6 @@
alloc = OCFS_BH_GET_DATA_WRITE(bh);
ocfs_clear_local_alloc(alloc);
- OCFS_BH_PUT_DATA(bh);
if (sync) {
status = ocfs_write_bh(osb, bh, OCFS_BH_IGNORE_JBD, NULL);
Modified: trunk/src/bitmap.c
===================================================================
--- trunk/src/bitmap.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/bitmap.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -214,7 +214,6 @@
if (bitoff >= size) {
nextbh:
/* we've hit the end of our bh. */
- OCFS_BH_PUT_DATA(currbh);
/*LOG_TRACE_ARGS("bitoff >= size (%u)\n", bitoff,c);*/
/* if it's the last bh, then quit the loop */
@@ -270,7 +269,6 @@
if (count == numBits) {
/* we've found everything we wanted. */
LOG_TRACE_ARGS("Found it all! (count=%u)\n", count);
- OCFS_BH_PUT_DATA(currbh);
buffer = NULL;
break;
}
@@ -313,7 +311,6 @@
count += BITCOUNT(tmp);
buffer++;
}
- OCFS_BH_PUT_DATA(currbh);
}
LOG_EXIT_ULONG ((unsigned long)count);
@@ -360,7 +357,6 @@
set_bit (local++, buff);
if ((local >= OCFS_BITS_IN_CHUNK(sb)) && (num != 0)) {
local = 0;
- OCFS_BH_PUT_DATA(currbh);
status = ocfs_journal_dirty(handle, currbh);
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -380,8 +376,6 @@
}
}
- OCFS_BH_PUT_DATA(currbh);
-
status = ocfs_journal_dirty(handle, currbh);
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -434,7 +428,6 @@
if ((local >= OCFS_BITS_IN_CHUNK(sb)) && (num != 0)) {
local = 0;
- OCFS_BH_PUT_DATA(currbh);
status = ocfs_journal_dirty(handle, currbh);
if (status < 0) {
@@ -456,8 +449,6 @@
}
}
- OCFS_BH_PUT_DATA(currbh);
-
status = ocfs_journal_dirty(handle, currbh);
if (status < 0) {
LOG_ERROR_STATUS(status);
Modified: trunk/src/buffer_head_io.c
===================================================================
--- trunk/src/buffer_head_io.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/buffer_head_io.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -308,8 +308,6 @@
SET_BH_SEQNUM(inode, bh);
else
CLEAR_BH_SEQNUM(bh);
-
- OCFS_BH_PUT_DATA(bh);
}
LOG_TRACE_ARGS("off=(%llu), len=(%llu), cached=%s\n", off, len,
(!(flags & OCFS_BH_CACHED) || ignore_cache) ? "no" : "yes");
Modified: trunk/src/buffer_head_io.h
===================================================================
--- trunk/src/buffer_head_io.h 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/buffer_head_io.h 2004-06-17 22:44:53 UTC (rev 1135)
@@ -99,7 +99,6 @@
#define OCFS_BH_GET_DATA_READ(bh) OCFS_BH_GET_DATA(bh)
#define OCFS_BH_GET_DATA_WRITE(bh) OCFS_BH_GET_DATA(bh)
#define OCFS_BH_GET_DATA_WRITE_TRYLOCK(bh) OCFS_BH_GET_DATA(bh)
-#define OCFS_BH_PUT_DATA(bh) do { } while(0)
#define STATE_BH_BITS 8
#define USED_BH_BITS 23 /* Number of BH bits used up through JBD */
@@ -149,11 +148,8 @@
strlen(OCFS_VOLUME_SIGNATURE)) != 0) {
printk("ocfs2: WARNING! attempting to write non "
"volume header to block 0\n");
- OCFS_BH_PUT_DATA(bh);
return -EIO;
}
-
- OCFS_BH_PUT_DATA(bh);
}
return 0;
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/dir.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -146,10 +146,6 @@
next block. */
filp->f_pos = (filp->f_pos |
(sb->s_blocksize - 1)) + 1;
- if (buf) {
- OCFS_BH_PUT_DATA(bh);
- buf = NULL;
- }
brelse (bh);
return stored;
}
@@ -180,10 +176,6 @@
}
filp->f_pos += le16_to_cpu(de->rec_len);
}
- if (buf) {
- OCFS_BH_PUT_DATA(bh);
- buf = NULL;
- }
offset = 0;
brelse (bh);
}
@@ -291,7 +283,6 @@
strcmp ("..", de1->name)) {
LOG_ERROR_ARGS ("bad directory (dir #%llu) - no `.' or `..'\n",
GET_INODE_FEOFF(inode));
- OCFS_BH_PUT_DATA(bh);
brelse (bh);
return 1;
}
@@ -299,7 +290,6 @@
de = (struct ocfs2_dir_entry *) ((char *) de1 + le16_to_cpu(de1->rec_len));
while (offset < inode->i_size ) {
if (!bh || (void *) de >= (void *) (bh->b_data + sb->s_blocksize)) {
- OCFS_BH_PUT_DATA(bh);
brelse (bh);
bh = ocfs_bread(NULL, inode,
offset >> sb->s_blocksize_bits, 0, &err, 0);
@@ -312,12 +302,10 @@
de = (struct ocfs2_dir_entry *) OCFS_BH_GET_DATA_READ(bh);
}
if (!ocfs_check_dir_entry (inode, de, bh, offset)) {
- OCFS_BH_PUT_DATA(bh);
brelse (bh);
return 1;
}
if (le64_to_cpu(de->inode)) {
- OCFS_BH_PUT_DATA(bh);
brelse (bh);
return 0;
}
@@ -325,7 +313,6 @@
de = (struct ocfs2_dir_entry *)
((char *) de + le16_to_cpu(de->rec_len));
}
- OCFS_BH_PUT_DATA(bh);
brelse (bh);
return 1;
}
Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/dlm.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -140,12 +140,10 @@
for (i = 0; i < numnodes; i++) {
pubsect = OCFS_BH_GET_DATA_READ(bhs[i]);
if (pubsect->time == (__u64) 0 || pubsect->publ_seq_num <= largestseqno) {
- OCFS_BH_PUT_DATA(bhs[i]);
continue;
}
largestseqno = pubsect->publ_seq_num;
if (pubsect->dirty) {
- OCFS_BH_PUT_DATA(bhs[i]);
if (!ocfs_node_is_alive(&osb->publ_map, i) ||
ocfs_node_is_recovering(osb, i)) {
LOG_TRACE_STR("Node is in recovery, trying"
@@ -162,8 +160,6 @@
status = -EAGAIN;
goto finally;
}
-
- OCFS_BH_PUT_DATA(bhs[i]);
}
/* Increment the largest sequence number by one & */
@@ -179,7 +175,6 @@
pubsect->vote_type = flags;
pubsect->lock_id = lock_id;
- OCFS_BH_PUT_DATA(bhs[osb->node_num]);
#ifdef VERBOSE_LOCKING_TRACE
printk("ocfs_disk_request_vote: lockid = %llu\n",lock_id);
#endif
@@ -214,7 +209,6 @@
LOG_ERROR_STATUS (status);
}
-
LOG_EXIT_STATUS (status);
return status;
} /* ocfs_disk_request_vote */
@@ -251,7 +245,6 @@
fe = OCFS_BH_GET_DATA_READ(bh);
curr_master = DISK_LOCK(fe)->dl_master;
lock_level = DISK_LOCK(fe)->dl_level;
- OCFS_BH_PUT_DATA(bh);
if ((curr_master == OCFS_INVALID_NODE_NUM) ||
(curr_master == osb->node_num)) {
@@ -265,7 +258,6 @@
fe = OCFS_BH_GET_DATA_WRITE(bh);
DISK_LOCK(fe)->dl_master = OCFS_INVALID_NODE_NUM;
DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
- OCFS_BH_PUT_DATA(bh);
tmpstat = ocfs_write_bh (osb, bh, 0, NULL);
if (tmpstat < 0) {
LOG_ERROR_STATUS (status = tmpstat);
@@ -344,7 +336,6 @@
fe = OCFS_BH_GET_DATA_WRITE(bh);
DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
lock_level = OCFS_DLM_NO_LOCK;
- OCFS_BH_PUT_DATA(bh);
tmpstat = ocfs_write_bh (osb, bh, 0, inode);
if (tmpstat < 0) {
LOG_ERROR_STATUS (tmpstat);
@@ -443,7 +434,6 @@
ocfs_process_one_vote_reply(osb, &ctxt, i);
}
- OCFS_BH_PUT_DATA(bhs[i]);
if (status < 0)
break;
}
@@ -550,7 +540,6 @@
ocfs_set_publish_vote_map(osb, pubsect, &vote_map);
/* Write it back */
- OCFS_BH_PUT_DATA(bh);
status = ocfs_write_bh (osb, bh, 0, NULL);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -583,7 +572,6 @@
ocfs2_dinode *fe = NULL;
int changed = 0;
ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);
-
LOG_ENTRY ();
@@ -607,7 +595,6 @@
if (flags & DLOCK_FLAG_MASTER &&
DISK_LOCK(fe)->dl_master != lockres->master_node_num) {
if (!changed) {
- OCFS_BH_PUT_DATA(*bh);
fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
@@ -617,7 +604,6 @@
if (flags & DLOCK_FLAG_LOCK &&
DISK_LOCK(fe)->dl_level != lockres->lock_type) {
if (!changed) {
- OCFS_BH_PUT_DATA(*bh);
fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
@@ -635,7 +621,6 @@
if (!ocfs_node_map_is_equal(&disk_map, &lockres->oin_openmap)) {
if (!changed) {
- OCFS_BH_PUT_DATA(*bh);
fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
@@ -646,15 +631,12 @@
if (flags & DLOCK_FLAG_SEQ_NUM &&
DISK_LOCK(fe)->dl_seq_num != lockres->last_upd_seq_num) {
if (!changed) {
- OCFS_BH_PUT_DATA(*bh);
fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
DISK_LOCK(fe)->dl_seq_num = lockres->last_upd_seq_num;
}
- OCFS_BH_PUT_DATA(*bh);
-
if (changed) {
if (handle) {
status = ocfs_journal_dirty(handle, *bh);
@@ -840,7 +822,6 @@
&lockres->oin_openmap);
}
updated = 1;
- OCFS_BH_PUT_DATA(*b);
}
reevaluate:
@@ -1050,7 +1031,6 @@
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe), &openmap);
#endif
curr_master = DISK_LOCK(fe)->dl_master;
- OCFS_BH_PUT_DATA(*b);
if (!IS_VALID_NODE_NUM (curr_master)) {
LOG_ERROR_STATUS(status = -EINVAL);
@@ -1152,8 +1132,6 @@
DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
}
- OCFS_BH_PUT_DATA(*b);
-
/* Reset the lock on the disk */
if (!cachelock) {
tmpstat = ocfs_write_bh (osb, *b, 0, inode);
@@ -1305,7 +1283,6 @@
/* 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_ENABLE_CACHE_LOCK);
- OCFS_BH_PUT_DATA(bh);
} else
need_lock_write = 0;
need_to_zap_buffers = 0;
@@ -1419,7 +1396,6 @@
fe = OCFS_BH_GET_DATA_READ(bh);
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe),
&lockres->oin_openmap);
- OCFS_BH_PUT_DATA(bh);
}
bail:
if (*disk_vote) {
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/file.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -112,7 +112,6 @@
fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!IS_VALID_FILE_ENTRY(fe)) {
- OCFS_BH_PUT_DATA(fe_bh);
status = -EINVAL;
LOG_ERROR_STATUS(status);
goto leave;
@@ -125,8 +124,6 @@
if (fe->i_blkno == 0)
LOG_ERROR_STR ("this_sector=0");
- OCFS_BH_PUT_DATA(fe_bh);
-
if (inode == osb->root_inode)
goto leave;
@@ -490,7 +487,6 @@
goto leave;
}
next_leaf = eb->h_next_leaf_blk;
- OCFS_BH_PUT_DATA(eb_bh);
eb = NULL;
eb_bh = NULL;
@@ -509,8 +505,6 @@
leave:
if (eb_bh) {
- if (eb)
- OCFS_BH_PUT_DATA(eb_bh);
brelse(eb_bh);
}
@@ -585,7 +579,6 @@
if (!IS_VALID_FILE_ENTRY(fileEntry)) {
LOG_ERROR_ARGS ("Invalid fe at offset %llu", file_off);
- OCFS_BH_PUT_DATA(bh);
status = -EFAIL;
goto leave;
}
@@ -598,7 +591,6 @@
/* now we always take an UPDATE lock */
lockFlags = FLAG_FILE_UPDATE;
- OCFS_BH_PUT_DATA(bh);
/* Start a transaction - need a minimal amount of block credits (1) */
handle = ocfs_start_trans(osb, 1);
@@ -635,8 +627,6 @@
/* Set the valid bit here */
fileEntry->i_flags |= OCFS2_VALID_FL;
- OCFS_BH_PUT_DATA(bh);
-
status = ocfs_journal_dirty(handle, bh);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -947,7 +937,6 @@
if (!IS_VALID_FILE_ENTRY(fe)) {
LOG_ERROR_ARGS ("Invalid fe at offset %llu", file_off);
status = -EFAIL;
- OCFS_BH_PUT_DATA(bh);
goto leave;
}
@@ -959,9 +948,6 @@
else
locktype = OCFS_DLM_EXCLUSIVE_LOCK;
- OCFS_BH_PUT_DATA(bh);
-
-
status = ocfs_acquire_lock (osb, locktype, lockFlags,
&bh, inode);
if (status < 0) {
@@ -990,7 +976,6 @@
LOG_TRACE_ARGS("asked to truncate file with size (%llu) "
"to size (%llu)!\n", fe->i_size,
file_size);
- OCFS_BH_PUT_DATA(bh);
up(&OCFS_I(inode)->priv_sem);
status = -EINVAL;
LOG_ERROR_STATUS(status);
@@ -1002,7 +987,6 @@
status = ocfs_free_extents_for_truncate (osb, fe, handle, inode);
if (status < 0) {
- OCFS_BH_PUT_DATA(bh);
up(&OCFS_I(inode)->priv_sem);
LOG_ERROR_STATUS (status);
goto leave;
@@ -1011,8 +995,6 @@
DISK_LOCK(fe)->dl_seq_num = 0;
fe->i_flags |= OCFS2_VALID_FL;
fe->i_mtime = OCFS_CURRENT_TIME;
-
- OCFS_BH_PUT_DATA(bh);
status = ocfs_journal_dirty(handle, bh);
if (status < 0) {
@@ -1103,13 +1085,11 @@
printk("fe->signature=%8s\n", fe->i_signature);
LOG_ERROR_ARGS ("Invalid fe at offset %llu", file_off);
status = -EFAIL;
- OCFS_BH_PUT_DATA(bh);
goto leave;
}
current_alloc = (u64)fe->i_clusters << osb->s_clustersize_bits;
alloc_size = file_size - current_alloc;
- OCFS_BH_PUT_DATA(bh);
fe = NULL;
LOG_TRACE_ARGS("current_alloc=%llu, alloc_size=%llu\n",
@@ -1136,7 +1116,6 @@
/* now we always take an EXTEND lock */
lockFlags = FLAG_FILE_EXTEND;
- OCFS_BH_PUT_DATA(bh);
brelse(bh);
bh = NULL;
@@ -1192,7 +1171,6 @@
LOG_TRACE_ARGS("find_space: alloc_size=%llu, returned off=%llu, num=%llu\n",
alloc_size, bitmapOffset, numClustersAlloc);
if (status < 0) {
- OCFS_BH_PUT_DATA(bh);
if (status != -ENOSPC && status != -EINTR)
LOG_ERROR_STATUS (status);
goto leave;
@@ -1201,7 +1179,6 @@
actualDiskOffset = bitmapOffset << osb->s_clustersize_bits;
actualLength = numClustersAlloc << osb->s_clustersize_bits;
- OCFS_BH_PUT_DATA(bh);
fe = NULL;
if (system_file) {
@@ -1229,7 +1206,6 @@
for(i = 0; i < numbhs; i++) {
data = OCFS_BH_GET_DATA_WRITE(bhs[i]);
memset(data, 0, osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(bhs[i]);
}
status = ocfs_write_bhs(osb, bhs, numbhs, 0, NULL);
@@ -1313,8 +1289,6 @@
tempOffset = fe->i_blkno << osb->sb->s_blocksize_bits;
- OCFS_BH_PUT_DATA(bh);
-
status = ocfs_journal_dirty(handle, bh);
if (status < 0) {
LOG_ERROR_STATUS (status);
Modified: trunk/src/heartbeat.c
===================================================================
--- trunk/src/heartbeat.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/heartbeat.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -96,7 +96,6 @@
spin_lock (&OcfsGlobalCtxt.comm_seq_lock);
publish->comm_seq_num = OcfsGlobalCtxt.comm_seq_num;
spin_unlock (&OcfsGlobalCtxt.comm_seq_lock);
- OCFS_BH_PUT_DATA(*pub_bh);
status = ocfs_write_bh(osb, *pub_bh, 0, NULL);
if (status < 0) {
@@ -150,7 +149,6 @@
spin_lock (&OcfsGlobalCtxt.comm_seq_lock);
OcfsGlobalCtxt.comm_seq_num = publish->comm_seq_num + 10;
spin_unlock (&OcfsGlobalCtxt.comm_seq_lock);
- OCFS_BH_PUT_DATA(bhs[osb->node_num]);
#endif
/* Refresh local buffers */
for (i = 0; i < num_nodes; i++) {
@@ -165,7 +163,6 @@
node_map[i].miss_cnt = 0;
ocfs_publish_map_set(&osb->publ_map, i);
}
- OCFS_BH_PUT_DATA(bhs[i]);
}
goto bail; /* exit */
}
@@ -174,10 +171,8 @@
publish = OCFS_BH_GET_DATA_READ(bhs[i]);
/* Loop if slot is unused */
- if (publish->time == (__u64) 0) {
- OCFS_BH_PUT_DATA(bhs[i]);
+ if (publish->time == 0ULL)
continue;
- }
/* Check if the node is hung or not by comparing the disk */
/* and memory timestamp values */
@@ -219,7 +214,6 @@
ocfs_publish_map_set(&osb->publ_map, i);
}
- OCFS_BH_PUT_DATA(bhs[i]);
}
bail:
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/inode.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -501,7 +501,7 @@
struct super_block *sb;
ocfs_super *osb;
__u64 feoff = 0ULL;
- ocfs2_dinode *fe = NULL;
+ ocfs2_dinode *fe;
struct buffer_head *bh = NULL;
int status;
int sysfile = 0;
@@ -550,9 +550,6 @@
ocfs_init_lockres (osb, inode);
bail:
- if (fe)
- OCFS_BH_PUT_DATA(bh);
-
if (args && bh)
brelse(bh);
@@ -733,7 +730,6 @@
/* check OCFS_SYNC_FLAG_ORPHANED */
fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!(fe->i_flags & OCFS2_ORPHANED_FL)) {
- OCFS_BH_PUT_DATA(fe_bh);
/* for lack of a better error? */
status = -EEXIST;
LOG_ERROR_STATUS(status);
@@ -742,13 +738,10 @@
/* has someone already deleted us?! baaad... */
if (fe->i_dtime) {
- OCFS_BH_PUT_DATA(fe_bh);
-
status = -EEXIST;
LOG_ERROR_STATUS(status);
goto bail_locked;
}
- OCFS_BH_PUT_DATA(fe_bh);
status = ocfs_orphan_del(osb, handle, orphan_dir_inode, inode,
orphan_dir_bh);
@@ -763,7 +756,6 @@
fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
fe->i_dtime = OCFS_CURRENT_TIME;
fe->i_flags &= (~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL));
- OCFS_BH_PUT_DATA(fe_bh);
status = ocfs_journal_dirty(handle, fe_bh);
if (status < 0) {
@@ -977,14 +969,12 @@
fe = OCFS_BH_GET_DATA_READ(bh);
if (!IS_VALID_FILE_ENTRY(fe)) {
- OCFS_BH_PUT_DATA(bh);
LOG_ERROR_ARGS ("Invalid fe at offset %llu", entryOffset);
goto bail;
}
if ((u64)iblock >= ocfs_clusters_to_blocks(inode->i_sb,
fe->i_clusters)) {
- OCFS_BH_PUT_DATA(bh);
LOG_ERROR_ARGS ("block offset is outside the allocated size: %llu",
(unsigned long long)iblock);
goto bail;
@@ -992,7 +982,6 @@
map_bh(bh_result, inode->i_sb,
fe->id2.i_list.l_recs[0].e_blkno + iblock);
- OCFS_BH_PUT_DATA(bh);
err = 0;
@@ -1085,7 +1074,6 @@
buf = OCFS_BH_GET_DATA_WRITE(bh);
memset(buf, 0, osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(bh);
fatal = ocfs_journal_dirty(handle, bh);
if (fatal)
goto fail;
@@ -1950,7 +1938,7 @@
{
int status = 0;
struct buffer_head *fe_bh = NULL;
- ocfs2_dinode *fe = NULL;
+ ocfs2_dinode *fe;
ocfs2_extent_list *fel;
__u64 offset;
int drop_priv_sem = 0;
@@ -2081,9 +2069,6 @@
}
}
- OCFS_BH_PUT_DATA(fe_bh);
- fe = NULL;
-
up(&OCFS_I(inode)->priv_sem);
drop_priv_sem = 0;
@@ -2098,11 +2083,8 @@
if (drop_priv_sem)
up(&OCFS_I(inode)->priv_sem);
- if (fe_bh) {
- if (fe)
- OCFS_BH_PUT_DATA(fe_bh);
+ if (fe_bh)
brelse(fe_bh);
- }
LOG_EXIT_STATUS (status);
return status;
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/journal.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -570,7 +570,6 @@
} else {
memcpy(data, co->data, bh->b_size);
}
- OCFS_BH_PUT_DATA(bh);
/* we no longer need the buffer in this case. */
if (!dirtied)
@@ -741,8 +740,6 @@
status = 0;
done:
- OCFS_BH_PUT_DATA(bh);
-
LOG_EXIT_STATUS(status);
return(status);
} /* ocfs_journal_access */
@@ -918,7 +915,6 @@
}
if (status < 0) {
- OCFS_BH_PUT_DATA(bh);
fe = NULL;
up_write(&OCFS_I(inode)->ip_io_sem);
@@ -932,7 +928,6 @@
alloc_size = (u64)fe->i_clusters << osb->s_clustersize_bits;
LOG_TRACE_ARGS("fe->i_blkno = %llu\n", fe->i_blkno);
inode->i_size = fe->i_size;
- OCFS_BH_PUT_DATA(bh);
fe = NULL;
/* we just changed this but extend_system_file doesn't know
@@ -984,8 +979,6 @@
done:
if (status < 0) {
if (bh != NULL) {
- if (fe)
- OCFS_BH_PUT_DATA(bh);
brelse(bh);
}
if (inode) {
@@ -1379,7 +1372,6 @@
fe = OCFS_BH_GET_DATA_READ(bh);
/* gonna need this later */
alloc_size = (u64)fe->i_clusters << osb->s_clustersize_bits;
- OCFS_BH_PUT_DATA(bh);
OCFS_I(inode)->alloc_size = alloc_size;
@@ -1512,8 +1504,6 @@
publish->vote_type = 0;
publish->mounted = 0;
- OCFS_BH_PUT_DATA(publish_bh);
-
/* Write the publish sector */
status = ocfs_write_bh(osb, publish_bh, 0, NULL);
if (status < 0) {
Modified: trunk/src/lockres.c
===================================================================
--- trunk/src/lockres.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/lockres.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -109,8 +109,6 @@
lockres->readonly_node = OCFS_INVALID_NODE_NUM;
}
- OCFS_BH_PUT_DATA(*b);
-
if (!locked)
ocfs_release_lockres (lockres); // ocfs_file_open ocfs_symlink ocfs_acquire_lock ocfs_process_vote ocfs_dentry_revalidate ocfs_file_write ocfs_file_read ocfs_setattr ocfs_getattr ocfs_direct_IO_get_blocks ocfs_rename
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/namei.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -250,7 +250,6 @@
file_off = fe->i_blkno << osb->sb->s_blocksize_bits;
handle->new_file_lockid =
fe->i_blkno << osb->sb->s_blocksize_bits;
- OCFS_BH_PUT_DATA(new_fe_bh);
fe = NULL;
ocfs_init_lockres (osb, inode);
@@ -288,7 +287,6 @@
strcpy (de->name, "..");
ocfs_set_de_type(dir->i_sb, de, S_IFDIR);
inode->i_nlink = 2;
- OCFS_BH_PUT_DATA(newdirbh);
status = ocfs_journal_dirty(handle, newdirbh);
brelse (newdirbh);
if (status < 0) {
@@ -304,7 +302,6 @@
}
fe = OCFS_BH_GET_DATA_WRITE(parent_fe_bh);
fe->i_links_count++;
- OCFS_BH_PUT_DATA(parent_fe_bh);
fe = NULL;
status = ocfs_journal_dirty(handle, parent_fe_bh);
if (status < 0) {
@@ -331,8 +328,6 @@
LOG_ERROR_STATUS(status);
if (new_fe_bh) {
- if (fe)
- OCFS_BH_PUT_DATA(new_fe_bh);
brelse(new_fe_bh);
}
@@ -448,7 +443,6 @@
fel->l_next_free_rec = 0;
fel->l_count = ocfs2_extent_recs_per_inode(osb->sb);
- OCFS_BH_PUT_DATA(*new_fe_bh);
fe = NULL;
status = ocfs_journal_dirty(handle, *new_fe_bh);
@@ -470,11 +464,6 @@
SET_BH_SEQNUM(inode, *new_fe_bh);
leave:
- if (fe) {
- OCFS_BH_PUT_DATA(*new_fe_bh);
- fe = NULL;
- }
-
if (status < 0 && *new_fe_bh) {
brelse(*new_fe_bh);
*new_fe_bh = NULL;
@@ -663,12 +652,10 @@
if (!fe->i_links_count) {
status = ocfs_orphan_add(osb, handle, inode, fe);
if (status < 0) {
- OCFS_BH_PUT_DATA(fe_bh);
LOG_ERROR_STATUS(status);
goto leave;
}
}
- OCFS_BH_PUT_DATA(fe_bh);
status = ocfs_journal_dirty(handle, fe_bh);
if (status < 0) {
@@ -693,7 +680,6 @@
}
dirfe = OCFS_BH_GET_DATA_WRITE(parent_node_bh);
dirfe->i_links_count--;
- OCFS_BH_PUT_DATA(parent_node_bh);
status = ocfs_journal_dirty(handle, fe_bh);
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -1095,13 +1081,11 @@
status = ocfs_orphan_add(osb, handle, new_inode,
newfe);
if (status < 0) {
- OCFS_BH_PUT_DATA(newfe_bh);
LOG_ERROR_STATUS(status);
goto finally;
}
}
- OCFS_BH_PUT_DATA(newfe_bh);
newfe = NULL;
status = ocfs_journal_dirty(handle, newfe_bh);
@@ -1121,7 +1105,6 @@
new_de->inode = le64_to_cpu(GET_INODE_FEOFF(old_inode));
new_de->file_type = old_de->file_type;
new_dir->i_version++;
- OCFS_BH_PUT_DATA(new_de_bh);
status = ocfs_journal_dirty(handle, new_de_bh);
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -1166,7 +1149,6 @@
}
OCFS_BH_GET_DATA_WRITE(old_inode_de_bh);
PARENT_INO(old_inode_de_bh->b_data) = le64_to_cpu(GET_INODE_FEOFF(new_dir));
- OCFS_BH_PUT_DATA(old_inode_de_bh);
status = ocfs_journal_dirty(handle, old_inode_de_bh);
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -1313,7 +1295,6 @@
fe = OCFS_BH_GET_DATA_READ(new_fe_bh);
file_off = fe->i_blkno << osb->sb->s_blocksize_bits;
- OCFS_BH_PUT_DATA(new_fe_bh);
fe = NULL;
status = ocfs_extend_file (osb, newsize, file_off, handle, inode, NULL, 0, new_fe_bh);
@@ -1329,7 +1310,6 @@
fe = OCFS_BH_GET_DATA_READ(new_fe_bh);
ocfs_populate_inode (inode, fe, 1);
- OCFS_BH_PUT_DATA(new_fe_bh);
fe = NULL;
inode->i_size = newsize;
@@ -1374,8 +1354,6 @@
bail:
up_write(&OCFS_I(dir)->ip_io_sem);
if (new_fe_bh) {
- if (fe)
- OCFS_BH_PUT_DATA(new_fe_bh);
brelse(new_fe_bh);
}
if (parent_fe_bh)
@@ -1432,7 +1410,7 @@
struct ocfs2_dir_entry * de, * de1;
struct super_block * sb;
int retval, status;
- char *buf = NULL;
+ char *buf;
ocfs2_dinode *fe = NULL;
sb = dir->i_sb;
@@ -1465,8 +1443,6 @@
de->inode = 0;
de->rec_len = le16_to_cpu(sb->s_blocksize);
dir->i_size = offset + sb->s_blocksize;
- OCFS_BH_PUT_DATA(bh);
- buf = NULL;
status = ocfs_journal_dirty(handle, bh);
/* update the parent file entry file size */
@@ -1474,15 +1450,11 @@
buf = OCFS_BH_GET_DATA_WRITE(parent_fe_bh);
fe = (ocfs2_dinode *)buf;
fe->i_size = dir->i_size;
- OCFS_BH_PUT_DATA(parent_fe_bh);
- buf = NULL;
status = ocfs_journal_dirty(handle, parent_fe_bh);
} else {
/* move to next block */
buf = OCFS_BH_GET_DATA_READ(bh);
de = (struct ocfs2_dir_entry *) bh->b_data;
- OCFS_BH_PUT_DATA(bh);
- buf = NULL;
}
}
@@ -1499,8 +1471,6 @@
(le16_to_cpu(de->rec_len) >= rec_len)) ||
(le16_to_cpu(de->rec_len) >=
(OCFS2_DIR_REC_LEN(de->name_len) + rec_len))) {
- OCFS_BH_PUT_DATA(bh);
- buf = NULL;
status = ocfs_journal_access(handle, bh, OCFS_JOURNAL_ACCESS_WRITE);
buf = OCFS_BH_GET_DATA_WRITE(bh);
/* By now the buffer is marked for journaling */
@@ -1522,8 +1492,6 @@
de->inode = 0;
de->name_len = namelen;
memcpy (de->name, name, namelen);
- OCFS_BH_PUT_DATA(bh);
- buf = NULL;
dir->i_mtime = dir->i_ctime = CURRENT_TIME;
dir->i_version++;
@@ -1533,14 +1501,10 @@
}
offset += le16_to_cpu(de->rec_len);
de = (struct ocfs2_dir_entry *) ((char *) de + le16_to_cpu(de->rec_len));
- OCFS_BH_PUT_DATA(bh);
- buf = NULL;
}
retval = -ENOSPC;
bail:
- if (buf)
- OCFS_BH_PUT_DATA(bh);
brelse (bh);
return retval;
}
@@ -1560,12 +1524,10 @@
de = OCFS_BH_GET_DATA_READ(bh);
while (i < bh->b_size) {
if (!ocfs_check_dir_entry(dir, de, bh, i)) {
- OCFS_BH_PUT_DATA(bh);
status = -EIO;
goto bail;
}
if (de == de_del) {
- OCFS_BH_PUT_DATA(bh);
status = ocfs_journal_access(handle, bh, OCFS_JOURNAL_ACCESS_WRITE);
if (status < 0) {
status = -EIO;
@@ -1577,7 +1539,6 @@
le16_to_cpu(de->rec_len));
else
de->inode = 0;
- OCFS_BH_PUT_DATA(bh);
dir->i_version++;
status = ocfs_journal_dirty(handle, bh);
goto bail;
@@ -1586,7 +1547,6 @@
pde = de;
de = (struct ocfs2_dir_entry *)((char *) de + le16_to_cpu(de->rec_len));
}
- OCFS_BH_PUT_DATA(bh);
bail:
return status;
}
@@ -1632,7 +1592,6 @@
de = (struct ocfs2_dir_entry *) ((char *) de + de_len);
}
bail:
- OCFS_BH_PUT_DATA(bh);
return ret;
}
@@ -1812,7 +1771,6 @@
if (S_ISDIR(inode->i_mode))
orphan_fe->i_links_count++;
orphan_dir_inode->i_nlink = orphan_fe->i_links_count;
- OCFS_BH_PUT_DATA(orphan_dir_bh);
status = ocfs_journal_dirty(handle, orphan_dir_bh);
if (status < 0) {
@@ -1899,7 +1857,6 @@
if (S_ISDIR(inode->i_mode))
orphan_fe->i_links_count--;
orphan_dir_inode->i_nlink = orphan_fe->i_links_count;
- OCFS_BH_PUT_DATA(orphan_dir_bh);
status = ocfs_journal_dirty(handle, orphan_dir_bh);
if (status < 0) {
@@ -1972,7 +1929,6 @@
inode->i_nlink = fe->i_links_count;
inode->i_ctime = CURRENT_TIME;
atomic_inc(&inode->i_count);
- OCFS_BH_PUT_DATA(bh);
err = ocfs_journal_dirty(handle, bh);
if (err < 0) {
Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/nm.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -216,7 +216,6 @@
if (osb->last_publ_seq_num[vote_node] == publish->publ_seq_num){
LOG_TRACE_ARGS("Already voted on node %d, seqnum (%llu)\n",
vote_node, publish->publ_seq_num);
- OCFS_BH_PUT_DATA(bh);
status = 0;
goto bail;
}
@@ -224,7 +223,6 @@
sv = ocfs_malloc(sizeof(struct ocfs_sched_vote));
if (sv == NULL) {
- OCFS_BH_PUT_DATA(bh);
LOG_ERROR_STATUS(status = -ENOMEM);
goto bail;
}
@@ -233,7 +231,6 @@
ctxt = &sv->ctxt;
ctxt->u.publish = (ocfs_publish *) &sv->publish_sect;
memcpy(ctxt->u.publish, publish, osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(bh);
ctxt->request_method = DISK_VOTE;
ctxt->node_num = vote_node;
@@ -332,7 +329,6 @@
BUG();
}
- OCFS_BH_PUT_DATA(bh);
bh = NULL;
ocfs_nm_heart_beat (osb, HEARTBEAT_METHOD_DISK, 0);
@@ -344,7 +340,6 @@
node_cfg_hdr = OCFS_BH_GET_DATA_READ(osb->autoconfig_bhs[1]);
num_nodes = node_cfg_hdr->num_nodes;
cfg_seq_num = node_cfg_hdr->cfg_seq_num;
- OCFS_BH_PUT_DATA(osb->autoconfig_bhs[1]);
if ((osb->cfg_seq_num != cfg_seq_num) ||
(osb->num_cfg_nodes != num_nodes)) {
@@ -395,7 +390,6 @@
highest_vote_node)) {
vote_node = highest_vote_node;
} else {
- OCFS_BH_PUT_DATA(osb->autoconfig_bhs[which]);
publish = NULL;
/* I guess we don't even have to do
* anything here... */
@@ -406,7 +400,6 @@
}
loop:
publish = NULL;
- OCFS_BH_PUT_DATA(osb->autoconfig_bhs[which]);
}
@@ -421,12 +414,10 @@
publish = OCFS_BH_GET_DATA_READ(bh);
voted = publish->vote;
- OCFS_BH_PUT_DATA(bh);
if (voted) {
publish = OCFS_BH_GET_DATA_WRITE(bh);
publish->vote = 0;
- OCFS_BH_PUT_DATA(bh);
status = ocfs_write_bh(osb, bh, 0, NULL);
if (status < 0) {
up(&(osb->publish_lock));
@@ -853,7 +844,6 @@
vote = OCFS_BH_GET_DATA_WRITE(vote_bh);
vote->node = (__u8)-1;
vote->type = 0;
- OCFS_BH_PUT_DATA(vote_bh);
status = ocfs_write_bh(osb, vote_bh, 0, NULL);
if (status < 0) {
brelse(vote_bh);
@@ -1095,7 +1085,6 @@
is_dir = S_ISDIR(fe->i_mode);
is_locked = DISK_LOCK(fe)->dl_level > OCFS_DLM_NO_LOCK;
if (vote_type == CHANGE_MASTER) {
- OCFS_BH_PUT_DATA(fe_bh);
fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
if (inode && OCFS_I(inode)->open_hndl_cnt) {
ocfs_node_map_init(osb, &disk_map);
@@ -1105,7 +1094,6 @@
}
DISK_LOCK(fe)->dl_master = node_num;
}
- OCFS_BH_PUT_DATA(fe_bh);
if (is_dir && vote_type == RELEASE_CACHE)
ocfs_break_cache_lock_zap_buffers(osb, inode);
@@ -1116,7 +1104,6 @@
LOG_TRACE_STR("release cache vote, setting to NO_LOCK");
fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
DISK_LOCK(fe)->dl_level = OCFS_DLM_NO_LOCK;
- OCFS_BH_PUT_DATA(fe_bh);
}
status = ocfs_write_bh(osb, fe_bh, 0, inode);
if (status < 0) {
@@ -1147,15 +1134,12 @@
if (!(fe->i_flags & OCFS2_VALID_FL)) {
vote_response = FLAG_VOTE_FILE_DEL;
- OCFS_BH_PUT_DATA(fe_bh);
} else {
ocfs_node_map_init(osb, &disk_map);
- OCFS_BH_PUT_DATA(fe_bh);
fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe), &disk_map);
ocfs_node_map_set_bit(&disk_map, node_num);
ocfs_set_disk_lock_open_map(osb, DISK_LOCK(fe), &disk_map);
- OCFS_BH_PUT_DATA(fe_bh);
/* Write new map on the disk */
status = ocfs_write_bh(osb, fe_bh, 0, inode);
@@ -1261,7 +1245,6 @@
vote->open_handle = open_handle;
vote->node = node_num;
vote->type = vote_response;
- OCFS_BH_PUT_DATA(vote_bh);
status = ocfs_write_bh(osb, vote_bh, 0, NULL);
brelse(vote_bh);
} else {
Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/super.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -794,7 +794,6 @@
buf->f_ffree = (sector_t) (numbits) - freebits;
#endif
- OCFS_BH_PUT_DATA(bh);
brelse(bh);
LOG_EXIT_INT (0);
@@ -869,7 +868,6 @@
hdr->signature);
status = -EINVAL;
}
- OCFS_BH_PUT_DATA(*bh);
brelse(*bh);
*bh = NULL;
if (status < 0) {
@@ -894,7 +892,6 @@
}
di = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(*bh);
status = ocfs_verify_volume(di, *bh, blksize);
- OCFS_BH_PUT_DATA(*bh);
if (status >= 0)
goto bail;
brelse(*bh);
@@ -1275,7 +1272,6 @@
retval = publish->mounted;
- OCFS_BH_PUT_DATA(publish_bh);
brelse(publish_bh);
done:
LOG_EXIT_STATUS(retval);
@@ -1302,7 +1298,6 @@
/* change it */
publish->mounted = value;
- OCFS_BH_PUT_DATA(publish_bh);
/* write it back out */
status = ocfs_write_bh(osb, publish_bh, 0, NULL);
@@ -1398,7 +1393,6 @@
di = OCFS_BH_GET_DATA_READ(bh);
osb->max_nodes = le32_to_cpu(di->id2.i_super.s_max_nodes);
printk("max_nodes for this device: %u\n", osb->max_nodes);
- OCFS_BH_PUT_DATA(bh);
/* FIXME
* This should be done in ocfs_journal_init(), but unknown
@@ -1538,8 +1532,6 @@
}
printk("root_blkno=%llu, system_dir_blkno=%llu\n", osb->root_blkno, osb->system_dir_blkno);
- OCFS_BH_PUT_DATA(bh);
-
/* load root, system_dir, and all global system inodes */
status = ocfs_init_global_system_inodes(osb);
if (status < 0) {
@@ -1677,7 +1669,6 @@
if (!publish->time)
publish->time = 1;
- OCFS_BH_PUT_DATA(publish_bh);
publish = NULL;
status = ocfs_write_bh (osb, publish_bh, 0, NULL);
@@ -1751,7 +1742,6 @@
finally:
if (publish) {
if (publish_bh) {
- OCFS_BH_PUT_DATA(publish_bh);
brelse(publish_bh);
}
}
@@ -1853,7 +1843,6 @@
/* we copy this out of the publish sector and then unlock
* the bh as other functions will need to modify it. */
mounted = publish->mounted;
- OCFS_BH_PUT_DATA(publish_bh);
publish = NULL;
/* Init our journal object. */
@@ -1902,8 +1891,6 @@
finally:
if (publish_bh) {
- if (publish)
- OCFS_BH_PUT_DATA(publish_bh);
brelse(publish_bh);
}
LOG_EXIT_STATUS (status);
Modified: trunk/src/volcfg.c
===================================================================
--- trunk/src/volcfg.c 2004-06-17 22:31:38 UTC (rev 1134)
+++ trunk/src/volcfg.c 2004-06-17 22:44:53 UTC (rev 1135)
@@ -146,7 +146,6 @@
__u32 node_num;
__u32 size;
struct buffer_head **cfg_bhs = NULL;
- int done = 0;
LOG_ENTRY ();
@@ -173,7 +172,6 @@
disk_node = OCFS_BH_GET_DATA_READ(cfg_bhs[pref_node_num]);
if (disk_node->node_name[0] == '\0')
node_num = pref_node_num;
- OCFS_BH_PUT_DATA(cfg_bhs[pref_node_num]);
}
/* if not, find the first available empty slot */
@@ -181,9 +179,6 @@
for (node_num = 0; node_num < osb->max_nodes; node_num++) {
disk_node = OCFS_BH_GET_DATA_READ(cfg_bhs[node_num]);
if (disk_node->node_name[0] == '\0')
- done = 1;
- OCFS_BH_PUT_DATA(cfg_bhs[node_num]);
- if (done)
break;
}
}
@@ -199,7 +194,6 @@
/* Copy the new nodecfg into the memory buffer */
buf = OCFS_BH_GET_DATA_WRITE(cfg_bhs[node_num]);
memcpy (buf, new_disk_node, osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(cfg_bhs[node_num]);
/* Write the new node details on disk */
status = ocfs_write_bh(osb, cfg_bhs[node_num], 0, NULL);
@@ -266,8 +260,6 @@
hdr->cfg_seq_num++;
memcpy(hdr_copy, hdr, osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(node_cfg_bhs[0]);
- OCFS_BH_PUT_DATA(node_cfg_bhs[1]);
/* Write the nodecfg header */
/* Write the nodecfg hdr into the second sector of newcfg also. */
/* We do so so that we can read the nodecfg hdr easily when we */
@@ -317,7 +309,6 @@
char *lock_buf;
int tried_acq = 0;
int break_lock = 0;
- int bh_locked = 0;
ocfs2_disk_lock *disk_lock;
ocfs_cfg_task *cfg_task;
__u64 lock_node_num = OCFS_INVALID_NODE_NUM;
@@ -363,7 +354,6 @@
}
lock_buf = OCFS_BH_GET_DATA_WRITE(bh);
- bh_locked = 1;
disk_lock = (ocfs2_disk_lock *)lock_buf;
lock_node_num = disk_lock->dl_master;
@@ -382,8 +372,6 @@
memcpy(cfg_buf, disk_lock, osb->sb->s_blocksize);
/* Write into volcfg lock sector... */
- OCFS_BH_PUT_DATA(bh);
- bh_locked = 0;
status = ocfs_write_bh(osb, bh, 0, NULL);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -394,10 +382,6 @@
ocfs_sleep (OCFS_VOLCFG_LOCK_TIME);
- if (bh_locked)
- OCFS_BH_PUT_DATA(bh);
- bh_locked = 0;
-
/* Read the volcfg lock sector again... */
status = ocfs_read_bh(osb, lock_off, &bh, 0, NULL);
if (status < 0) {
@@ -410,7 +394,6 @@
/* If we tried to acquire and we still own it we take it... */
if ((tried_acq) && (memcmp (lock_buf, cfg_buf, osb->sb->s_blocksize) == 0)) {
memcpy (lock_buf, cfg_buf, osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(bh);
/* Set timer to reiterate lock every few jiffies */
LOG_TRACE_ARGS ("Start Timer: %lu\n", jiffies);
@@ -448,7 +431,6 @@
disk_lock->dl_master);
ocfs_sleep (OCFS_VOLCFG_LOCK_TIME);
}
- OCFS_BH_PUT_DATA(bh);
}
}
@@ -498,7 +480,6 @@
/* reset lock... */
memset (buffer, 0, osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(bh);
/* Release the lock */
status = ocfs_write_bh(osb, bh, 0, NULL);
@@ -517,7 +498,6 @@
buffer = OCFS_BH_GET_DATA_WRITE(bh);
/* reset lock... */
memset (buffer, 0, osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(bh);
/* Release the lock */
status = ocfs_write_bh(osb, bh, 0, NULL);
@@ -642,7 +622,6 @@
buf = OCFS_BH_GET_DATA_WRITE(bh);
memcpy(buf, disk, osb->sb->s_blocksize);
- OCFS_BH_PUT_DATA(bh);
status = ocfs_write_bh(osb, bh, 0, NULL);
if (status < 0) {
@@ -792,18 +771,17 @@
disk = OCFS_BH_GET_DATA_READ(cfg_bhs[which]);
if (disk->node_name[0] == '\0')
- goto loop;
+ continue;
status = ocfs_disknode_to_node (&osb->node_cfg_info[i], disk);
if (status < 0) {
- OCFS_BH_PUT_DATA(cfg_bhs[which]);
LOG_ERROR_STATUS (status);
goto finally;
}
/* If nodenum is set, goto next node */
if (osb->node_num != OCFS_INVALID_NODE_NUM)
- goto loop;
+ continue;
/*
* If node num is not set, set it if guid matches.
@@ -818,14 +796,14 @@
if (!memcmp(&OcfsGlobalCtxt.guid.guid, disk->guid.guid,
OCFS2_GUID_LEN)) {
osb->node_num = i;
- goto loop;
+ continue;
}
/* If the hostid does not match, goto next... */
if (memcmp(&OcfsGlobalCtxt.guid.id.host_id,
disk->guid.id.host_id,
OCFS2_GUID_HOSTID_LEN))
- goto loop;
+ continue;
/* ...else allow node to reclaim the number if reclaimid set */
if (osb->reclaim_id) {
@@ -833,21 +811,16 @@
/* Write this node's cfg with the new guid on disk */
status = ocfs_refresh_node_config (osb);
if (status < 0) {
- OCFS_BH_PUT_DATA(cfg_bhs[which]);
LOG_ERROR_STATUS(status);
goto finally;
}
}
else {
- OCFS_BH_PUT_DATA(cfg_bhs[which]);
LOG_ERROR_STR("Re-mount volume with the reclaimid " \
"option to reclaim the node number");
status = -EFAIL;
goto finally;
}
-loop:
- OCFS_BH_PUT_DATA(cfg_bhs[which]);
- continue;
}
osb->cfg_initialized = 1;
@@ -858,8 +831,6 @@
finally:
if (cfg_bhs) {
- if (cfg_bhs[0])
- OCFS_BH_PUT_DATA(cfg_bhs[0]);
for (i = 0; i < numblocks; i++)
if (cfg_bhs[i])
brelse(cfg_bhs[i]);
More information about the Ocfs2-commits
mailing list