[Ocfs2-commits] mfasheh commits r1350 - in trunk: . src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Aug 11 14:27:59 CDT 2004
Author: mfasheh
Date: 2004-08-11 13:27:57 -0500 (Wed, 11 Aug 2004)
New Revision: 1350
Modified:
trunk/TODO
trunk/src/alloc.c
trunk/src/buffer_head_io.c
trunk/src/buffer_head_io.h
trunk/src/file.c
trunk/src/inode.c
trunk/src/journal.c
Log:
* remove the OCFS_BH_COND_CACHED flag
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2004-08-10 21:23:11 UTC (rev 1349)
+++ trunk/TODO 2004-08-11 18:27:57 UTC (rev 1350)
@@ -51,9 +51,6 @@
* turn lock ids into a block based value instead of bytes.
-* get rid of the OCFS_BH_COND_CACHED flag as it should always just be
- OCFS_BH_CACHED now.
-
* Find all the ocfs_sleep calls and change the values to something
much much lower.
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-08-10 21:23:11 UTC (rev 1349)
+++ trunk/src/alloc.c 2004-08-11 18:27:57 UTC (rev 1350)
@@ -833,7 +833,7 @@
bh = NULL;
status = ocfs_read_bh(osb,
tmp_blk << osb->sb->s_blocksize_bits,
- &bh, OCFS_BH_COND_CACHED,
+ &bh, OCFS_BH_CACHED,
inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -1067,7 +1067,7 @@
status = ocfs_read_bh(osb,
fe->i_last_eb_blk << osb->sb->s_blocksize_bits,
- &bh, OCFS_BH_COND_CACHED, inode);
+ &bh, OCFS_BH_CACHED, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto finally;
@@ -1107,7 +1107,7 @@
for (i = 0; i < fel->l_count; ++i) {
status = ocfs_read_bh(osb,
fel->l_recs[i].e_blkno << osb->sb->s_blocksize_bits,
- &bh, OCFS_BH_COND_CACHED,
+ &bh, OCFS_BH_CACHED,
inode);
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -1234,7 +1234,7 @@
status = ocfs_read_bh(osb,
fe->i_last_eb_blk << osb->sb->s_blocksize_bits,
- &eb1_bh, OCFS_BH_COND_CACHED, inode);
+ &eb1_bh, OCFS_BH_CACHED, inode);
if (status < 0) {
LOG_ERROR_STATUS (status = -EINVAL);
goto finally;
@@ -1311,7 +1311,7 @@
status = ocfs_read_bh(osb,
parent_blk << osb->sb->s_blocksize_bits,
&eb2_bh,
- OCFS_BH_COND_CACHED,
+ OCFS_BH_CACHED,
inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -1405,7 +1405,7 @@
status = ocfs_read_bh(osb,
parent_blk << osb->sb->s_blocksize_bits,
&eb2_bh,
- OCFS_BH_COND_CACHED,
+ OCFS_BH_CACHED,
inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -1697,7 +1697,7 @@
status = ocfs_read_bh(osb,
cur_el->l_recs[victim].e_blkno << osb->sb->s_blocksize_bits,
&tmp_bh,
- OCFS_BH_COND_CACHED,
+ OCFS_BH_CACHED,
inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -1842,7 +1842,7 @@
status = ocfs_read_bh(osb,
rec->e_blkno << osb->sb->s_blocksize_bits,
&tmp_bh2,
- OCFS_BH_COND_CACHED, inode);
+ OCFS_BH_CACHED, inode);
if (status < 0) {
eb = NULL;
brelse(tmp_bh2);
@@ -1921,7 +1921,7 @@
status = ocfs_read_bh(osb,
rec->e_blkno << osb->sb->s_blocksize_bits,
&tmp_bh,
- OCFS_BH_COND_CACHED,
+ OCFS_BH_CACHED,
inode);
if (status < 0) {
eb = NULL;
@@ -2284,7 +2284,7 @@
status = ocfs_read_bh(osb,
rec->e_blkno << osb->sb->s_blocksize_bits,
&bh_stack[tos],
- OCFS_BH_COND_CACHED,
+ OCFS_BH_CACHED,
inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -2633,7 +2633,7 @@
/* Read the file Entry corresponding to this */
status = ocfs_read_bh(osb,
OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
- &fe_bh, OCFS_BH_COND_CACHED, inode);
+ &fe_bh, OCFS_BH_CACHED, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto finally;
@@ -2714,7 +2714,7 @@
status = ocfs_read_bh(osb,
next_leaf << osb->sb->s_blocksize_bits,
&eb_bh,
- OCFS_BH_COND_CACHED,
+ OCFS_BH_CACHED,
inode);
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -2800,7 +2800,7 @@
for (i = 1; i < fel->l_tree_depth; i++) {
tempstat = ocfs_read_bh(osb,
child_blkno << osb->sb->s_blocksize_bits,
- &ext_bh, OCFS_BH_COND_CACHED,
+ &ext_bh, OCFS_BH_CACHED,
inode);
if (tempstat < 0) {
LOG_ERROR_STATUS (status = tempstat);
@@ -2835,7 +2835,7 @@
tempstat = ocfs_read_bh(osb,
child_blkno << osb->sb->s_blocksize_bits,
- data_extent_bh, OCFS_BH_COND_CACHED,
+ data_extent_bh, OCFS_BH_CACHED,
inode);
if (tempstat < 0) {
LOG_ERROR_STATUS (status = tempstat);
@@ -3365,7 +3365,7 @@
status = ocfs_read_bh(osb,
fel->l_recs[i].e_blkno << osb->sb->s_blocksize_bits,
&extent_bh,
- OCFS_BH_COND_CACHED,
+ OCFS_BH_CACHED,
inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
Modified: trunk/src/buffer_head_io.c
===================================================================
--- trunk/src/buffer_head_io.c 2004-08-10 21:23:11 UTC (rev 1349)
+++ trunk/src/buffer_head_io.c 2004-08-11 18:27:57 UTC (rev 1350)
@@ -98,7 +98,7 @@
* journal so we can control when they actually hit disk and
* so we can make sure they never get overwritten by a
* subsequent read. */
- if ((flags & OCFS_BH_CACHED) || (flags & OCFS_BH_COND_CACHED)) {
+ if (flags & OCFS_BH_CACHED) {
LOG_TRACE_STR("asking for a cached write!");
status = -EINVAL;
LOG_ERROR_STATUS(status);
@@ -213,10 +213,6 @@
goto bail;
}
- if (inode && (flags & OCFS_BH_COND_CACHED) &&
- !(OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE))
- flags |= OCFS_BH_CACHED;
-
sb = osb->sb;
blocknum = off >> sb->s_blocksize_bits;
Modified: trunk/src/buffer_head_io.h
===================================================================
--- trunk/src/buffer_head_io.h 2004-08-10 21:23:11 UTC (rev 1349)
+++ trunk/src/buffer_head_io.h 2004-08-11 18:27:57 UTC (rev 1350)
@@ -63,10 +63,9 @@
#define OCFS_BH_CACHED 1
-#define OCFS_BH_COND_CACHED 2
-#define OCFS_BH_CONCURRENT_WRITE 4 /* This should only be used by ocfs_worker */
-#define OCFS_BH_IGNORE_JBD 8 /* This should only be used by ocfs_checkpoint_handle! */
-#define OCFS_BH_READAHEAD 16 /* use this to pass READA down to submit_bh */
+#define OCFS_BH_CONCURRENT_WRITE 2 /* This should only be used by ocfs_worker */
+#define OCFS_BH_IGNORE_JBD 4 /* This should only be used by ocfs_checkpoint_handle! */
+#define OCFS_BH_READAHEAD 8 /* use this to pass READA down to submit_bh */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
/*
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-08-10 21:23:11 UTC (rev 1349)
+++ trunk/src/file.c 2004-08-11 18:27:57 UTC (rev 1350)
@@ -478,7 +478,7 @@
ret = ocfs_read_bh(osb,
next_leaf << osb->sb->s_blocksize_bits,
&eb_bh,
- OCFS_BH_COND_CACHED, inode);
+ OCFS_BH_CACHED, inode);
if (ret < 0) {
LOG_ERROR_STATUS(ret);
goto leave;
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-08-10 21:23:11 UTC (rev 1349)
+++ trunk/src/inode.c 2004-08-11 18:27:57 UTC (rev 1350)
@@ -2126,7 +2126,7 @@
status = ocfs_read_bh(osb,
OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
- &fe_bh, OCFS_BH_COND_CACHED, inode);
+ &fe_bh, OCFS_BH_CACHED, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto leave;
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-08-10 21:23:11 UTC (rev 1349)
+++ trunk/src/journal.c 2004-08-11 18:27:57 UTC (rev 1350)
@@ -1828,7 +1828,7 @@
status = ocfs_read_bh(osb,
(osb->publish_blkno + node_num) << osb->sb->s_blocksize_bits,
&publish_bh,
- OCFS_BH_COND_CACHED, NULL);
+ 0, NULL);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto finally;
More information about the Ocfs2-commits
mailing list