[Ocfs2-commits] mfasheh commits r953 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu May 27 14:16:29 CDT 2004
Author: mfasheh
Date: 2004-05-27 13:16:27 -0500 (Thu, 27 May 2004)
New Revision: 953
Modified:
trunk/src/alloc.c
trunk/src/file.c
trunk/src/journal.c
trunk/src/namei.c
Log:
* Cleanup a pair of unused variables in journal.c
* Use the system inode array instead of iget to grab node system
inodes.
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-05-27 10:10:41 UTC (rev 952)
+++ trunk/src/alloc.c 2004-05-27 18:16:27 UTC (rev 953)
@@ -340,7 +340,7 @@
}
if (free_vol_bits != NULL) {
- vol_inode = ocfs_iget(osb, OCFS_BITMAP_LOCK_OFFSET, NULL);
+ vol_inode = igrab(osb->system_inodes[GLOBAL_BITMAP_SYSTEM_INODE]);
if (!vol_inode) {
status = -EINVAL;
LOG_ERROR_STATUS (status);
@@ -2667,7 +2667,7 @@
OCFS_ASSERT (osb);
if (!bitmap_inode) {
- bitmap_inode = ocfs_iget(osb, OCFS_BITMAP_LOCK_OFFSET, NULL);
+ bitmap_inode = igrab(osb->system_inodes[GLOBAL_BITMAP_SYSTEM_INODE]);
if (!bitmap_inode) {
status = -EINVAL;
LOG_ERROR_STR("Could not get bitmap inode!");
@@ -2872,12 +2872,14 @@
blockSize = (__u32) osb->vol_layout.file_node_size;
blockSizeBits = osb->file_alloc_bits;
atomic_inc(&osb->alloc_stats.ext_allocs);
+ inode = igrab(osb->system_inodes[FILE_ALLOC_BITMAP_SYSTEM_INODE]);
break;
case DISK_ALLOC_INODE:
bm_file = OCFS_INODE_BITMAP + NodeNum;
alloc_file = OCFS_INODE_FILE + NodeNum;
blockSize = (__u32) osb->inode_size;
blockSizeBits = osb->inode_alloc_bits;
+ inode = igrab(osb->system_inodes[INODE_ALLOC_BITMAP_SYSTEM_INODE]);
break;
default:
status = -EINVAL;
@@ -2885,19 +2887,17 @@
goto leave;
}
- /* Allocate a block of size blocksize from the relevant file/bitmap */
-
- OCFS_ASSERT (blockSize);
-
- lockId = (bm_file * osb->sect_size) + osb->vol_layout.root_int_off;
- inode = ocfs_iget(osb, lockId, NULL);
if (!inode) {
status = -EINVAL;
LOG_ERROR_STATUS(status);
goto leave;
}
+ /* Allocate a block of size blocksize from the relevant file/bitmap */
+ OCFS_ASSERT (blockSize);
+
/* Get a lock on the file */
+ lockId = (bm_file * osb->sect_size) + osb->vol_layout.root_int_off;
status = ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
FLAG_FILE_CREATE, &bh, inode);
if (status < 0) {
@@ -3508,8 +3508,7 @@
alloc = NULL;
if (!main_bm_inode)
- main_bm_inode = ocfs_iget(osb, OCFS_BITMAP_LOCK_OFFSET,
- NULL);
+ main_bm_inode = igrab(osb->system_inodes[GLOBAL_BITMAP_SYSTEM_INODE]);
if (!main_bm_inode) {
status = -EINVAL;
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-05-27 10:10:41 UTC (rev 952)
+++ trunk/src/file.c 2004-05-27 18:16:27 UTC (rev 953)
@@ -1111,7 +1111,6 @@
ocfs_journal_handle *handle = NULL;
int credits;
struct inode *ext_alloc_inode = NULL;
- __u64 ext_alloc_off;
LOG_ENTRY ();
@@ -1248,8 +1247,7 @@
}
}
- ext_alloc_off = ((OCFS_FILE_FILE_ALLOC_BITMAP + osb->node_num) * osb->sect_size) + osb->vol_layout.root_int_off;
- ext_alloc_inode = ocfs_iget(osb, ext_alloc_off, NULL);
+ ext_alloc_inode = igrab(osb->system_inodes[FILE_ALLOC_BITMAP_SYSTEM_INODE]);
if (!ext_alloc_inode) {
status = -EFAIL;
LOG_ERROR_STATUS(status);
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-05-27 10:10:41 UTC (rev 952)
+++ trunk/src/journal.c 2004-05-27 18:16:27 UTC (rev 953)
@@ -829,7 +829,6 @@
struct inode *inode = NULL; /* the journal inode */
journal_t * k_journal = NULL;
ocfs_file_entry *fe = NULL;
- __u32 journal_file_id = 0;
__u64 lock_id = 0;
struct buffer_head *bh = NULL;
__u64 alloc_size;
@@ -845,7 +844,6 @@
INIT_LIST_HEAD(&(osb->journal.commited));
init_MUTEX(&(osb->journal.commit_sem));
- journal_file_id = (__u32) (OCFS_JOURNAL_FILE + osb->node_num);
lock_id = ((OCFS_JOURNAL_FILE + osb->node_num) * osb->sect_size) +
osb->vol_layout.root_int_off;
@@ -1371,7 +1369,6 @@
{
int status = -1;
__u64 lock_id = 0;
- __u32 journal_file_id = 0;
ocfs_file_entry *fe = NULL;
struct inode *inode = NULL;
journal_t *k_journal = NULL;
@@ -1400,7 +1397,6 @@
}
/* get the journal file fe and lock */
- journal_file_id = (__u32) (OCFS_JOURNAL_FILE + node_num);
lock_id = ((OCFS_JOURNAL_FILE + node_num) * osb->sect_size)
+ osb->vol_layout.root_int_off;
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-05-27 10:10:41 UTC (rev 952)
+++ trunk/src/namei.c 2004-05-27 18:16:27 UTC (rev 953)
@@ -312,7 +312,6 @@
ocfs_file_entry *fe = NULL;
__u64 bitmapOffset = 0;
__u64 fileOffset = 0;
- __u64 inode_alloc_off;
struct inode *inode_alloc_inode = NULL;
LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, %d, '%*s')\n", dir, dentry, mode,
@@ -321,8 +320,7 @@
OCFS_ASSERT(new_fe_bh);
*new_fe_bh = NULL;
- inode_alloc_off = ((OCFS_INODE_BITMAP + osb->node_num) * osb->sect_size) + osb->vol_layout.root_int_off;
- inode_alloc_inode = ocfs_iget(osb, inode_alloc_off, NULL);
+ inode_alloc_inode = igrab(osb->system_inodes[INODE_ALLOC_BITMAP_SYSTEM_INODE]);
if (!inode_alloc_inode) {
status = -EFAIL;
LOG_ERROR_STATUS(status);
More information about the Ocfs2-commits
mailing list