[Ocfs2-commits] mfasheh commits r1145 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Jun 17 22:57:55 CDT 2004
Author: mfasheh
Date: 2004-06-17 21:57:54 -0500 (Thu, 17 Jun 2004)
New Revision: 1145
Modified:
trunk/src/alloc.c
trunk/src/extmap.c
trunk/src/file.c
trunk/src/inode.c
trunk/src/journal.c
trunk/src/lockres.c
trunk/src/namei.c
trunk/src/nm.c
trunk/src/ocfs.h
trunk/src/super.c
Log:
* fix up inode_private variables to be prefixed with ip_
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-06-18 02:56:38 UTC (rev 1144)
+++ trunk/src/alloc.c 2004-06-18 02:57:54 UTC (rev 1145)
@@ -576,7 +576,7 @@
goto leave;
}
fileSize = inode->i_size;
- allocSize = OCFS_I(inode)->alloc_size;
+ allocSize = OCFS_I(inode)->ip_alloc_size;
ocfs_initialize_bitmap(osb->sb, &AllocBitmap, fileSize * 8,
allocSize * 8);
@@ -1443,7 +1443,7 @@
Lbo = blkno << osb->sb->s_blocksize_bits;
/* Add the Entry to the extent map list */
- if (!ocfs_add_extent_map_entry(osb, &OCFS_I(inode)->map,
+ if (!ocfs_add_extent_map_entry(osb, &OCFS_I(inode)->ip_ext_map,
Vbo, Lbo,
(u64)new_clusters << osb->s_clustersize_bits))
LOG_ERROR_STATUS (status = -EFAIL);
@@ -2517,28 +2517,28 @@
/* for direct io we want to skip all locking. If you're a
* system file, ip_io_sem should already have been taken
* before coming here. */
- if (((OCFS_I(inode)->oin_flags & OCFS_OIN_OPEN_FOR_DIRECTIO)
- || OCFS_I(inode)->flags & OCFS_INODE_SYSTEM_FILE)
+ if (((OCFS_I(inode)->ip_open_flags & OCFS_OIN_OPEN_FOR_DIRECTIO)
+ || OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE)
&& (!locked))
printk("ocfs2: inode %lu, locked = %d, open direct = %u, "
"sysfile = %u\n", inode->i_ino, locked,
- (OCFS_I(inode)->oin_flags & OCFS_OIN_OPEN_FOR_DIRECTIO),
- (OCFS_I(inode)->flags & OCFS_INODE_SYSTEM_FILE));
+ (OCFS_I(inode)->ip_open_flags & OCFS_OIN_OPEN_FOR_DIRECTIO),
+ (OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE));
if (!locked)
- down(&(OCFS_I(inode)->priv_sem));
+ down(&(OCFS_I(inode)->ip_sem));
check_alloc_sz:
status = 0;
- if (Vbo < OCFS_I(inode)->alloc_size)
+ if (Vbo < OCFS_I(inode)->ip_alloc_size)
status = ocfs_lookup_extent_map_entry(osb,
- &(OCFS_I(inode)->map),
+ &(OCFS_I(inode)->ip_ext_map),
Vbo, Lbo, &cnt,
&NumIndex);
if (!locked)
- up(&(OCFS_I(inode)->priv_sem));
+ up(&(OCFS_I(inode)->ip_sem));
if (status &&
(cnt >= (u64)blocks << osb->sb->s_blocksize_bits)) {
@@ -2552,18 +2552,18 @@
if (!locked) {
/* yay for lock ordering. We must take ip_io_sem
- * before priv_sem. */
+ * before ip_sem. */
down_read(&OCFS_I(inode)->ip_io_sem);
- down(&OCFS_I(inode)->priv_sem);
+ down(&OCFS_I(inode)->ip_sem);
}
/* Make sure we still need to hit disk. */
- if (Vbo >= OCFS_I(inode)->alloc_size) {
+ if (Vbo >= OCFS_I(inode)->ip_alloc_size) {
if (!locked)
up_read(&OCFS_I(inode)->ip_io_sem);
goto check_alloc_sz;
}
- up(&OCFS_I(inode)->priv_sem);
+ up(&OCFS_I(inode)->ip_sem);
if (!locked)
have_io_sem = 1;
@@ -2592,21 +2592,21 @@
}
if (Vbo >= (__s64)((u64)fe->i_clusters << osb->s_clustersize_bits)) {
- LOG_ERROR_ARGS ("vbo=%llu, fe->i_clusters=%u alloc_size=%llu",
+ LOG_ERROR_ARGS ("vbo=%llu, fe->i_clusters=%u ip_alloc_size=%llu",
Vbo, fe->i_clusters,
- OCFS_I(inode)->alloc_size);
+ OCFS_I(inode)->ip_alloc_size);
status = -EFAIL;
goto finally;
}
if (fe->id2.i_list.l_tree_depth < 0) {
if (!locked)
- down(&(OCFS_I(inode)->priv_sem));
+ down(&(OCFS_I(inode)->ip_sem));
status = ocfs_update_extent_map(osb,
- &OCFS_I(inode)->map, fe,
+ &OCFS_I(inode)->ip_ext_map, fe,
NULL, NULL, LOCAL_EXT);
if (!locked)
- up(&(OCFS_I(inode)->priv_sem));
+ up(&(OCFS_I(inode)->ip_sem));
if (status < 0) {
LOG_ERROR_STATUS (status);
goto finally;
@@ -2625,14 +2625,14 @@
eb = (ocfs2_extent_block *) eb_bh->b_data;
while (1) {
if (!locked)
- down(&(OCFS_I(inode)->priv_sem));
+ down(&(OCFS_I(inode)->ip_sem));
status = ocfs_update_extent_map(osb,
- &OCFS_I(inode)->map,
+ &OCFS_I(inode)->ip_ext_map,
eb, &localVbo,
&remainingLength,
NONLOCAL_EXT);
if (!locked)
- up(&(OCFS_I(inode)->priv_sem));
+ up(&(OCFS_I(inode)->ip_sem));
if (status < 0) {
LOG_ERROR_STATUS(status);
goto finally;
@@ -2641,10 +2641,10 @@
if (remainingLength > 0) {
if (!eb->h_next_leaf_blk) {
LOG_ERROR_ARGS ("localVbo=%llu, "
- "alloc_size=%llu, "
+ "ip_alloc_size=%llu, "
" thisext=%llu",
localVbo,
- OCFS_I(inode)->alloc_size,
+ OCFS_I(inode)->ip_alloc_size,
eb->h_blkno);
status = -EFAIL;
goto finally;
@@ -2678,17 +2678,17 @@
}
if (!locked)
- down(&(OCFS_I(inode)->priv_sem));
- if (ocfs_lookup_extent_map_entry(osb, &(OCFS_I(inode)->map),
+ down(&(OCFS_I(inode)->ip_sem));
+ if (ocfs_lookup_extent_map_entry(osb, &(OCFS_I(inode)->ip_ext_map),
Vbo, Lbo, &cnt, &NumIndex) &&
(cnt >= (u64)blocks << osb->sb->s_blocksize_bits)) {
status = 0;
} else {
status = -EFAIL;
- printk("failed to lookup extmap... vbo=%llu mapcount=%d\n", Vbo, OCFS_I(inode)->map.count);
+ printk("failed to lookup extmap... vbo=%llu mapcount=%d\n", Vbo, OCFS_I(inode)->ip_ext_map.count);
}
if (!locked)
- up(&(OCFS_I(inode)->priv_sem));
+ up(&(OCFS_I(inode)->ip_sem));
success:
/* want to return cnt only if asked for it */
@@ -3136,12 +3136,12 @@
newFileSize = alloc_fe->i_size;
allocSize = (u64)alloc_fe->i_clusters << osb->s_clustersize_bits;
if (newFileSize != alloc_inode->i_size ||
- allocSize != OCFS_I(alloc_inode)->alloc_size) {
+ allocSize != OCFS_I(alloc_inode)->ip_alloc_size) {
LOG_ERROR_ARGS("aha! alloc inode was out of date! "
"newFileSize=%llu, i_size=%llu, "
- "allocSize=%llu, alloc_size=%llu\n",
+ "allocSize=%llu, ip_alloc_size=%llu\n",
newFileSize, alloc_inode->i_size,
- allocSize, OCFS_I(alloc_inode)->alloc_size);
+ allocSize, OCFS_I(alloc_inode)->ip_alloc_size);
}
//newFileSize = alloc_inode->i_size;
Modified: trunk/src/extmap.c
===================================================================
--- trunk/src/extmap.c 2004-06-18 02:56:38 UTC (rev 1144)
+++ trunk/src/extmap.c 2004-06-18 02:57:54 UTC (rev 1145)
@@ -482,14 +482,15 @@
LOG_ENTRY ();
- RunsInExtentMap = OCFS_I(inode)->map.count;
+ RunsInExtentMap = OCFS_I(inode)->ip_ext_map.count;
for (ExtentMapIndex = 0; ExtentMapIndex < RunsInExtentMap;
ExtentMapIndex++) {
if (ocfs_get_next_extent_map_entry
- (osb, &OCFS_I(inode)->map, ExtentMapIndex, &Vbo, &Lbo,
- &ByteCount)) {
- ocfs_remove_extent_map_entry (osb, &OCFS_I(inode)->map,
+ (osb, &OCFS_I(inode)->ip_ext_map, ExtentMapIndex, &Vbo,
+ &Lbo, &ByteCount)) {
+ ocfs_remove_extent_map_entry (osb,
+ &OCFS_I(inode)->ip_ext_map,
Vbo, ByteCount);
}
}
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-06-18 02:56:38 UTC (rev 1144)
+++ trunk/src/file.c 2004-06-18 02:57:54 UTC (rev 1145)
@@ -94,7 +94,7 @@
/*
* ocfs_inode_notify_open()
*
- * you should be holding io_sem and priv_sem in this function.
+ * you should be holding io_sem and ip_sem in this function.
* If needed add ourselves to the open map. Only call this
* on 1st open of a file. Marks the oin as "in use"
*/
@@ -118,9 +118,9 @@
}
/* why do we update these here? */
- OCFS_I(inode)->alloc_size =
+ OCFS_I(inode)->ip_alloc_size =
(u64)fe->i_clusters << osb->s_clustersize_bits;
- OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dl_seq_num;
+ OCFS_I(inode)->ip_chng_seq_num = DISK_LOCK(fe)->dl_seq_num;
if (fe->i_blkno == 0)
LOG_ERROR_STR ("this_sector=0");
@@ -207,11 +207,11 @@
}
down_write (&(OCFS_I(inode)->ip_io_sem));
- down (&(OCFS_I(inode)->priv_sem));
+ down (&(OCFS_I(inode)->ip_sem));
have_oin_sem = 1;
/* first open, we've gotta update the lock state. */
- if (!OCFS_I(inode)->open_hndl_cnt) {
+ if (!OCFS_I(inode)->ip_open_cnt) {
status = ocfs_read_bh(osb, GET_INODE_FEOFF(inode), &fe_bh,
OCFS_BH_CACHED, inode);
if (status < 0) {
@@ -243,49 +243,49 @@
}
up_write(&OCFS_I(inode)->ip_io_sem);
- /* yes, hold onto priv_sem. */
+ /* yes, hold onto ip_sem. */
- if (OCFS_I(inode)->open_hndl_cnt > 0) {
+ if (OCFS_I(inode)->ip_open_cnt > 0) {
/* The OIN is currently in use by some thread. */
/* We must check whether the requested access/share access */
/* conflicts with the existing open operations. */
- LOG_TRACE_ARGS ("oin->open_hndl_cnt > 0! : %u\n",
- OCFS_I(inode)->open_hndl_cnt);
+ LOG_TRACE_ARGS ("oin->ip_open_cnt > 0! : %u\n",
+ OCFS_I(inode)->ip_open_cnt);
if (!(mode & O_DIRECT)) {
- if ((OCFS_I(inode)->oin_flags & OCFS_OIN_OPEN_FOR_DIRECTIO) && !(mode & O_RDONLY)) {
+ if ((OCFS_I(inode)->ip_open_flags & OCFS_OIN_OPEN_FOR_DIRECTIO) && !(mode & O_RDONLY)) {
status = -EACCES;
LOG_TRACE_STR("file is already open O_DIRECT, "
"cannot open non O_DIRECT");
goto leave;
}
- OCFS_CLEAR_FLAG(OCFS_I(inode)->oin_flags, OCFS_OIN_OPEN_FOR_DIRECTIO);
+ OCFS_CLEAR_FLAG(OCFS_I(inode)->ip_open_flags, OCFS_OIN_OPEN_FOR_DIRECTIO);
} else if (mode & O_DIRECT) {
- if (!(OCFS_I(inode)->oin_flags & OCFS_OIN_OPEN_FOR_DIRECTIO)) {
+ if (!(OCFS_I(inode)->ip_open_flags & OCFS_OIN_OPEN_FOR_DIRECTIO)) {
status = -EACCES;
LOG_TRACE_STR("file is already open non " \
"O_DIRECT, cannot open " \
"O_DIRECT");
goto leave;
}
- OCFS_SET_FLAG(OCFS_I(inode)->oin_flags, OCFS_OIN_OPEN_FOR_DIRECTIO);
+ OCFS_SET_FLAG(OCFS_I(inode)->ip_open_flags, OCFS_OIN_OPEN_FOR_DIRECTIO);
}
status = 0;
} else {
- ocfs_extent_map_destroy (&OCFS_I(inode)->map);
- ocfs_extent_map_init (&OCFS_I(inode)->map);
+ ocfs_extent_map_destroy (&OCFS_I(inode)->ip_ext_map);
+ ocfs_extent_map_init (&OCFS_I(inode)->ip_ext_map);
if (mode & O_DIRECT)
- OCFS_SET_FLAG(OCFS_I(inode)->oin_flags, OCFS_OIN_OPEN_FOR_DIRECTIO);
+ OCFS_SET_FLAG(OCFS_I(inode)->ip_open_flags, OCFS_OIN_OPEN_FOR_DIRECTIO);
else {
- OCFS_CLEAR_FLAG(OCFS_I(inode)->oin_flags, OCFS_OIN_OPEN_FOR_DIRECTIO);
+ OCFS_CLEAR_FLAG(OCFS_I(inode)->ip_open_flags, OCFS_OIN_OPEN_FOR_DIRECTIO);
truncate_pages = 1;
}
}
- OCFS_I(inode)->open_hndl_cnt++;
+ OCFS_I(inode)->ip_open_cnt++;
if (have_oin_sem) {
- up (&(OCFS_I(inode)->priv_sem));
+ up (&(OCFS_I(inode)->ip_sem));
have_oin_sem = 0;
}
@@ -303,7 +303,7 @@
leave:
if (have_oin_sem) {
- up (&(OCFS_I(inode)->priv_sem));
+ up (&(OCFS_I(inode)->ip_sem));
have_oin_sem = 0;
}
@@ -352,47 +352,47 @@
goto bail;
}
- down (&(OCFS_I(inode)->priv_sem));
- OCFS_I(inode)->open_hndl_cnt--;
- if (!OCFS_I(inode)->open_hndl_cnt)
+ down (&(OCFS_I(inode)->ip_sem));
+ OCFS_I(inode)->ip_open_cnt--;
+ if (!OCFS_I(inode)->ip_open_cnt)
last_close = 1;
if (inode == osb->root_inode) {
- up (&(OCFS_I(inode)->priv_sem));
+ up (&(OCFS_I(inode)->ip_sem));
goto bail;
}
LOG_TRACE_ARGS ("openhandles: %d / osbfiles: %lld / refcount: %d\n",
- OCFS_I(inode)->open_hndl_cnt, osb->file_open_cnt,
+ OCFS_I(inode)->ip_open_cnt, osb->file_open_cnt,
atomic_read(&dentry->d_count));
if (last_close) {
- ocfs_extent_map_destroy (&OCFS_I(inode)->map);
- ocfs_extent_map_init (&OCFS_I(inode)->map);
+ ocfs_extent_map_destroy (&OCFS_I(inode)->ip_ext_map);
+ ocfs_extent_map_init (&OCFS_I(inode)->ip_ext_map);
- if (OCFS_I(inode)->oin_flags & OCFS_OIN_OPEN_FOR_DIRECTIO)
- OCFS_CLEAR_FLAG(OCFS_I(inode)->oin_flags, OCFS_OIN_OPEN_FOR_DIRECTIO);
+ if (OCFS_I(inode)->ip_open_flags & OCFS_OIN_OPEN_FOR_DIRECTIO)
+ OCFS_CLEAR_FLAG(OCFS_I(inode)->ip_open_flags, OCFS_OIN_OPEN_FOR_DIRECTIO);
- /* we might still be holding inode_extend_sem on
+ /* we might still be holding ip_extend_sem on
* behalf of another node, so release it here. */
down(&recovery_list_sem);
spin_lock(&oin_num_ext_lock);
- if (OCFS_I(inode)->num_extends) {
+ if (OCFS_I(inode)->ip_num_extends) {
LOG_TRACE_ARGS("ocfs2: closing inode %llu -- had %u "
"extends pending from another node!\n",
GET_INODE_FEOFF(inode),
- OCFS_I(inode)->num_extends);
- OCFS_I(inode)->num_extends = 0;
- list_del(&OCFS_I(inode)->recovery_list);
- INIT_LIST_HEAD(&OCFS_I(inode)->recovery_list);
- up_write(&OCFS_I(inode)->inode_extend_sem);
+ OCFS_I(inode)->ip_num_extends);
+ OCFS_I(inode)->ip_num_extends = 0;
+ list_del(&OCFS_I(inode)->ip_recovery_list);
+ INIT_LIST_HEAD(&OCFS_I(inode)->ip_recovery_list);
+ up_write(&OCFS_I(inode)->ip_extend_sem);
dec = 1;
}
spin_unlock(&oin_num_ext_lock);
up(&recovery_list_sem);
}
- up (&(OCFS_I(inode)->priv_sem));
+ up (&(OCFS_I(inode)->ip_sem));
ocfs_sync_inode(inode);
if (last_close) {
@@ -440,7 +440,7 @@
for (j = 0; j < el->l_next_free_rec; j++) {
/* Add the Extent to extent map */
ret = ocfs_add_extent_map_entry_from_rec(osb->sb,
- &OCFS_I(inode)->map,
+ &OCFS_I(inode)->ip_ext_map,
&el->l_recs[j]);
if (!ret) {
LOG_ERROR_STATUS (ret = -ENOMEM);
@@ -472,7 +472,7 @@
for (j = 0; j < el->l_next_free_rec; j++) {
/* Add the Extent to extent map */
ret = ocfs_add_extent_map_entry_from_rec(osb->sb,
- &OCFS_I(inode)->map,
+ &OCFS_I(inode)->ip_ext_map,
&el->l_recs[j]);
if (!ret) {
LOG_ERROR_STATUS (ret =
@@ -722,9 +722,9 @@
if (!(filp->f_flags & O_DIRECT)) {
/* FIXME: is the down_sem supposed to be here?! */
LOG_TRACE_ARGS ("non O_DIRECT write, fileopencount=%d\n",
- OCFS_I(inode)->open_hndl_cnt);
- if (OCFS_I(inode)->open_hndl_cnt > 1) {
- if (OCFS_I(inode)->oin_flags & OCFS_OIN_OPEN_FOR_WRITE) {
+ OCFS_I(inode)->ip_open_cnt);
+ if (OCFS_I(inode)->ip_open_cnt > 1) {
+ if (OCFS_I(inode)->ip_open_flags & OCFS_OIN_OPEN_FOR_WRITE) {
LOG_TRACE_STR
("uh oh! someone else is doing non O_DIRECT writes!\n");
ret = -EIO;
@@ -733,7 +733,7 @@
LOG_TRACE_STR
("there are other readers, but you're the first writer\n");
saAcquired = 1;
- OCFS_SET_FLAG(OCFS_I(inode)->oin_flags, OCFS_OIN_OPEN_FOR_WRITE);
+ OCFS_SET_FLAG(OCFS_I(inode)->ip_open_flags, OCFS_OIN_OPEN_FOR_WRITE);
}
}
}
@@ -779,7 +779,7 @@
if (writingAtEOF) {
LOG_TRACE_ARGS
("Will need more allocation: have=%llu, need=%llu\n",
- OCFS_I(inode)->alloc_size, newsize);
+ OCFS_I(inode)->ip_alloc_size, newsize);
down_write(&OCFS_I(inode)->ip_io_sem);
status = ocfs_extend_file (osb, newsize, GET_INODE_FEOFF(inode), NULL, inode,
NULL, 0, NULL);
@@ -820,7 +820,7 @@
bail:
if (saAcquired) {
- OCFS_CLEAR_FLAG(OCFS_I(inode)->oin_flags, OCFS_OIN_OPEN_FOR_WRITE);
+ OCFS_CLEAR_FLAG(OCFS_I(inode)->ip_open_flags, OCFS_OIN_OPEN_FOR_WRITE);
}
LOG_EXIT_INT (ret);
@@ -964,7 +964,7 @@
goto leave;
}
- down(&OCFS_I(inode)->priv_sem);
+ down(&OCFS_I(inode)->ip_sem);
fe = (ocfs2_dinode *) bh->b_data;
@@ -976,7 +976,7 @@
LOG_TRACE_ARGS("asked to truncate file with size (%llu) "
"to size (%llu)!\n", fe->i_size,
file_size);
- up(&OCFS_I(inode)->priv_sem);
+ up(&OCFS_I(inode)->ip_sem);
status = -EINVAL;
LOG_ERROR_STATUS(status);
goto leave;
@@ -987,7 +987,7 @@
status = ocfs_free_extents_for_truncate (osb, fe, handle, inode);
if (status < 0) {
- up(&OCFS_I(inode)->priv_sem);
+ up(&OCFS_I(inode)->ip_sem);
LOG_ERROR_STATUS (status);
goto leave;
}
@@ -998,14 +998,14 @@
status = ocfs_journal_dirty(handle, bh);
if (status < 0) {
- up(&OCFS_I(inode)->priv_sem);
+ up(&OCFS_I(inode)->ip_sem);
LOG_ERROR_STATUS (status);
goto leave;
}
/* if we updated correctly then we can update the alloc_size */
- OCFS_I(inode)->alloc_size = new_alloc_size;
- up (&(OCFS_I(inode)->priv_sem));
+ OCFS_I(inode)->ip_alloc_size = new_alloc_size;
+ up (&(OCFS_I(inode)->ip_sem));
leave:
if (handle && (status == 0))
@@ -1254,10 +1254,10 @@
fe->i_clusters +=
(u32)(actualLength >> osb->s_clustersize_bits);
- down (&(OCFS_I(inode)->priv_sem));
- OCFS_I(inode)->alloc_size =
+ down (&(OCFS_I(inode)->ip_sem));
+ OCFS_I(inode)->ip_alloc_size =
(u64)fe->i_clusters << osb->s_clustersize_bits;
- up (&(OCFS_I(inode)->priv_sem));
+ up (&(OCFS_I(inode)->ip_sem));
/* no need to do OCFS_SECTOR_ALIGN once the allocation size is correct. */
DISK_LOCK(fe)->dl_seq_num = 0;
@@ -1272,12 +1272,12 @@
* system files do not have another opportunity to update
* the inode/i_private fields */
if (system_file) {
- OCFS_I(inode)->alloc_size = (u64)fe->i_clusters << osb->s_clustersize_bits;
+ OCFS_I(inode)->ip_alloc_size = (u64)fe->i_clusters << osb->s_clustersize_bits;
inode->i_size = fe->i_size;
inode->i_blocks = (inode->i_size + osb->sb->s_blocksize - 1) >> osb->sb->s_blocksize_bits;
}
- LOG_TRACE_ARGS("inode: alloc_size=%llu, i_size=%llu\n",
- OCFS_I(inode)->alloc_size, inode->i_size);
+ LOG_TRACE_ARGS("inode: ip_alloc_size=%llu, i_size=%llu\n",
+ OCFS_I(inode)->ip_alloc_size, inode->i_size);
if (attr)
ocfs_fe_set_attributes(fe, attr);
@@ -1429,13 +1429,13 @@
goto bail;
}
- down (&(OCFS_I(inode)->priv_sem));
+ down (&(OCFS_I(inode)->ip_sem));
if (inode->i_size > newsize) {
ocfs_delete_all_extent_maps(osb, inode);
}
inode->i_size = newsize;
inode->i_blocks = (newsize + sb->s_blocksize - 1) >> sb->s_blocksize_bits;
- up (&(OCFS_I(inode)->priv_sem));
+ up (&(OCFS_I(inode)->ip_sem));
}
status = -EFAIL;
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-06-18 02:56:38 UTC (rev 1144)
+++ trunk/src/inode.c 2004-06-18 02:57:54 UTC (rev 1145)
@@ -316,13 +316,13 @@
i = inode->u.generic_ip;
memset(i, 0, sizeof(ocfs_inode_private));
- i->flags = 0;
- atomic_set(&i->i_clean_buffer_seq, 0);
- init_MUTEX(&(i->priv_sem));
- init_rwsem(&(i->inode_extend_sem));
- i->open_hndl_cnt = 0;
- ocfs_extent_map_init (&i->map);
- INIT_LIST_HEAD(&i->recovery_list);
+ i->ip_flags = 0;
+ atomic_set(&i->ip_clean_buffer_seq, 0);
+ init_MUTEX(&(i->ip_sem));
+ init_rwsem(&(i->ip_extend_sem));
+ i->ip_open_cnt = 0;
+ ocfs_extent_map_init (&i->ip_ext_map);
+ INIT_LIST_HEAD(&i->ip_recovery_list);
INIT_LIST_HEAD(&i->ip_handle_list);
i->ip_handle = NULL;
@@ -331,10 +331,10 @@
atomic_set(&i->ip_needs_verification, 0);
/* These should be set in read_inode2. */
- i->alloc_size = 0ULL;
- i->feoff = 0ULL;
+ i->ip_alloc_size = 0ULL;
+ i->ip_feoff = 0ULL;
- OCFS_SET_FLAG (i->flags, OCFS_INODE_INITIALIZED);
+ OCFS_SET_FLAG (i->ip_flags, OCFS_INODE_INITIALIZED);
return 0;
} /* ocfs_inode_init_private */
@@ -387,15 +387,12 @@
SET_INODE_FEOFF(inode,
fe->i_blkno << osb->sb->s_blocksize_bits);
- OCFS_I(inode)->alloc_size =
+ OCFS_I(inode)->ip_alloc_size =
(u64)fe->i_clusters << osb->s_clustersize_bits;
- OCFS_I(inode)->inode = inode;
- OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dl_seq_num;
+ OCFS_I(inode)->ip_inode = inode;
+ OCFS_I(inode)->ip_chng_seq_num = DISK_LOCK(fe)->dl_seq_num;
OCFS_I(inode)->u.fe_private = fe->id1.i_pad1;
- if (S_ISDIR(fe->i_mode))
- OCFS_I(inode)->oin_flags |= OCFS_OIN_DIRECTORY;
-
if (create_ino)
inode->i_ino = ino_from_blkno(inode->i_sb, fe->i_blkno);
@@ -543,7 +540,7 @@
BUG();
if (sysfile)
- OCFS_SET_FLAG(OCFS_I(inode)->flags, OCFS_INODE_SYSTEM_FILE);
+ OCFS_SET_FLAG(OCFS_I(inode)->ip_flags, OCFS_INODE_SYSTEM_FILE);
ocfs_init_lockres (osb, inode);
@@ -654,7 +651,7 @@
LOG_ENTRY_ARGS("(inode->i_ino = %lu)\n", inode->i_ino);
- if (OCFS_I(inode)->flags & OCFS_INODE_SYSTEM_FILE) {
+ if (OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE) {
LOG_TRACE_STR("Skipping system file delete.");
goto clear_inode;
}
@@ -664,7 +661,7 @@
goto clear_inode;
}
- if (OCFS_I(inode)->flags & OCFS_INODE_SKIP_DELETE) {
+ if (OCFS_I(inode)->ip_flags & OCFS_INODE_SKIP_DELETE) {
LOG_TRACE_ARGS("Skipping delete of %lu because another node "
"has done this for us.\n", inode->i_ino);
goto clear_inode;
@@ -818,7 +815,7 @@
goto bail;
}
- OCFS_CLEAR_FLAG (OCFS_I(inode)->flags, OCFS_INODE_INITIALIZED);
+ OCFS_CLEAR_FLAG (OCFS_I(inode)->ip_flags, OCFS_INODE_INITIALIZED);
offset = GET_INODE_FEOFF(inode);
if (offset == -1)
@@ -840,11 +837,11 @@
goto bail;
}
- ocfs_extent_map_destroy (&OCFS_I(inode)->map);
- ocfs_extent_map_init (&OCFS_I(inode)->map);
+ ocfs_extent_map_destroy (&OCFS_I(inode)->ip_ext_map);
+ ocfs_extent_map_init (&OCFS_I(inode)->ip_ext_map);
down(&recovery_list_sem);
- list_del(&OCFS_I(inode)->recovery_list);
+ list_del(&OCFS_I(inode)->ip_recovery_list);
up(&recovery_list_sem);
/* clean out the inode private ... why?! */
@@ -1021,8 +1018,8 @@
new = 1;
}
- /* ???: do we need priv_sem? should have i_sem i think */
- if (vbo >= OCFS_I(inode)->alloc_size) {
+ /* ???: do we need ip_sem? should have i_sem i think */
+ if (vbo >= OCFS_I(inode)->ip_alloc_size) {
int vbo_pad;
vbo_pad = inode->i_sb->s_blocksize;
@@ -1109,7 +1106,7 @@
LOG_ENTRY_ARGS ("(0x%p, %llu, 0x%p, %d)\n", inode,
(unsigned long long)iblock, bh_result, create);
- open_direct = OCFS_I(inode)->oin_flags & OCFS_OIN_OPEN_FOR_DIRECTIO;
+ open_direct = OCFS_I(inode)->ip_open_flags & OCFS_OIN_OPEN_FOR_DIRECTIO;
if (S_ISLNK (inode->i_mode)) {
/* this always does I/O for some reason. */
@@ -1128,7 +1125,7 @@
osb = OCFS_SB(inode->i_sb);
vbo = (__s64) iblock << inode->i_sb->s_blocksize_bits;
- if (!INODE_JOURNAL(inode) && vbo >= OCFS_I(inode)->alloc_size) {
+ if (!INODE_JOURNAL(inode) && vbo >= OCFS_I(inode)->ip_alloc_size) {
int vbo_pad;
vbo_pad = inode->i_sb->s_blocksize;
@@ -1151,11 +1148,11 @@
len = 1;
if (!open_direct)
- down_read(&OCFS_I(inode)->inode_extend_sem);
+ down_read(&OCFS_I(inode)->ip_extend_sem);
err = ocfs_lookup_file_allocation(osb, vbo, &lbo, len, NULL,
inode, open_direct);
if (!open_direct)
- up_read(&OCFS_I(inode)->inode_extend_sem);
+ up_read(&OCFS_I(inode)->ip_extend_sem);
if (err < 0) {
LOG_ERROR_ARGS ("vbo=%lld lbo=%lld len=%u", vbo, lbo, len);
goto bail;
@@ -1386,7 +1383,7 @@
/* NOTE: create flag is set when we ?may? have to allocate some
blocks for the file. */
- if (create && vbo_max > OCFS_I(inode)->alloc_size) {
+ if (create && vbo_max > OCFS_I(inode)->ip_alloc_size) {
/* WARNING: How much do we really want to extend the file? */
status = ocfs_extend_file(osb, vbo_max, GET_INODE_FEOFF(inode),
NULL, inode, NULL, 0, NULL);
@@ -1885,14 +1882,14 @@
osb = OCFS_SB(inode->i_sb);
down_read (&(OCFS_I(inode)->ip_io_sem));
- down (&(OCFS_I(inode)->priv_sem));
+ down (&(OCFS_I(inode)->ip_sem));
if (INODE_DELETED(inode)) {
- up (&(OCFS_I(inode)->priv_sem));
+ up (&(OCFS_I(inode)->ip_sem));
LOG_TRACE_STR("inode deleted!\n");
status = -ENOENT;
goto bail;
}
- up (&(OCFS_I(inode)->priv_sem));
+ up (&(OCFS_I(inode)->ip_sem));
if (ocfs_node_map_is_only(osb, &osb->publ_map, osb->node_num)) {
LOG_TRACE_STR ("Only node alive.");
@@ -1937,7 +1934,7 @@
ocfs2_dinode *fe;
ocfs2_extent_list *fel;
__u64 offset;
- int drop_priv_sem = 0;
+ int drop_ip_sem = 0;
/* We are setting the oin Updated flag in the end. */
LOG_ENTRY ();
@@ -1956,15 +1953,15 @@
goto leave;
}
- down(&OCFS_I(inode)->priv_sem);
+ down(&OCFS_I(inode)->ip_sem);
if (INODE_DELETED(inode)) {
- up(&OCFS_I(inode)->priv_sem);
+ up(&OCFS_I(inode)->ip_sem);
LOG_TRACE_ARGS("Inode %llu was marked as deleted!",
GET_INODE_FEOFF(inode));
status = -ENOENT;
goto leave;
}
- up(&OCFS_I(inode)->priv_sem);
+ up(&OCFS_I(inode)->ip_sem);
status = ocfs_read_bh(osb, offset, &fe_bh, OCFS_BH_COND_CACHED, inode);
if (status < 0) {
@@ -1972,13 +1969,13 @@
goto leave;
}
- down(&OCFS_I(inode)->priv_sem);
- drop_priv_sem = 1;
+ down(&OCFS_I(inode)->ip_sem);
+ drop_ip_sem = 1;
fe = (ocfs2_dinode *) fe_bh->b_data;
/* Make sure that what we found is not a directory. */
- if ((OCFS_I(inode)->oin_flags & OCFS_OIN_DIRECTORY))
+ if (S_ISDIR(inode->i_mode))
goto leave;
/* Add checks as needed */
@@ -1993,19 +1990,19 @@
goto leave;
}
- if ((OCFS_I(inode)->alloc_size !=
+ if ((OCFS_I(inode)->ip_alloc_size !=
(__s64)((u64)fe->i_clusters << osb->s_clustersize_bits)) ||
(inode->i_size != (__s64) fe->i_size) ||
- (OCFS_I(inode)->chng_seq_num != DISK_LOCK(fe)->dl_seq_num) ||
+ (OCFS_I(inode)->ip_chng_seq_num != DISK_LOCK(fe)->dl_seq_num) ||
inode->i_uid != fe->i_uid ||
inode->i_gid != fe->i_gid ||
inode->i_mode != fe->i_mode ||
inode->i_nlink != fe->i_links_count){
- if (OCFS_I(inode)->alloc_size >
+ if (OCFS_I(inode)->ip_alloc_size >
(__s64)((u64)fe->i_clusters << osb->s_clustersize_bits)) {
- ocfs_extent_map_destroy (&OCFS_I(inode)->map);
- ocfs_extent_map_init (&OCFS_I(inode)->map);
+ ocfs_extent_map_destroy (&OCFS_I(inode)->ip_ext_map);
+ ocfs_extent_map_init (&OCFS_I(inode)->ip_ext_map);
}
if (le32_to_cpu(fe->i_flags) & OCFS2_BITMAP_FL) {
@@ -2019,13 +2016,13 @@
}
LOG_TRACE_STR("Allocsize, filesize or seq no did not match");
- OCFS_I(inode)->alloc_size =
+ OCFS_I(inode)->ip_alloc_size =
(u64)fe->i_clusters << osb->s_clustersize_bits;
inode->i_size = fe->i_size;
LOG_TRACE_ARGS("verifyupdate: setting nlink from %d to %d for %llu\n",
inode->i_nlink, fe->i_links_count, GET_INODE_FEOFF(inode));
inode->i_nlink = fe->i_links_count;
- OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dl_seq_num;
+ OCFS_I(inode)->ip_chng_seq_num = DISK_LOCK(fe)->dl_seq_num;
inode->i_blocks = (inode->i_size + osb->sb->s_blocksize - 1) >> osb->sb->s_blocksize_bits;
inode->i_uid = fe->i_uid;
inode->i_gid = fe->i_gid;
@@ -2035,10 +2032,10 @@
OCFS_SET_INODE_TIME(inode, i_atime, fe->i_atime);
OCFS_SET_INODE_TIME(inode, i_mtime, fe->i_mtime);
if (!S_ISDIR (inode->i_mode) &&
- (OCFS_I(inode)->alloc_size !=
+ (OCFS_I(inode)->ip_alloc_size !=
(__s64)((u64)fe->i_clusters << osb->s_clustersize_bits) ||
inode->i_size != (__s64) fe->i_size ||
- OCFS_I(inode)->chng_seq_num != DISK_LOCK(fe)->dl_seq_num)) {
+ OCFS_I(inode)->ip_chng_seq_num != DISK_LOCK(fe)->dl_seq_num)) {
*needs_trunc = 1;
}
@@ -2058,15 +2055,15 @@
/* Add the Extents to extent map */
for (j = 0; j < fel->l_next_free_rec; j++) {
if (!ocfs_add_extent_map_entry_from_rec(osb->sb,
- &OCFS_I(inode)->map,
+ &OCFS_I(inode)->ip_ext_map,
&fel->l_recs[j]))
goto leave;
}
}
}
- up(&OCFS_I(inode)->priv_sem);
- drop_priv_sem = 0;
+ up(&OCFS_I(inode)->ip_sem);
+ drop_ip_sem = 0;
status = ocfs_update_lockres (osb, GET_INODE_FEOFF(inode), &fe_bh,
NULL, 0, inode, 0, lockres_locked);
@@ -2076,8 +2073,8 @@
if (status == 0)
atomic_set(&OCFS_I(inode)->ip_needs_verification, 0);
- if (drop_priv_sem)
- up(&OCFS_I(inode)->priv_sem);
+ if (drop_ip_sem)
+ up(&OCFS_I(inode)->ip_sem);
if (fe_bh)
brelse(fe_bh);
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-06-18 02:56:38 UTC (rev 1144)
+++ trunk/src/journal.c 2004-06-18 02:57:54 UTC (rev 1145)
@@ -240,7 +240,7 @@
list_for_each_safe(p, n, &handle->inode_list) {
ip = list_entry(p, ocfs_inode_private, ip_handle_list);
- inode = ip->inode;
+ inode = ip->ip_inode;
OCFS_I(inode)->ip_handle = NULL;
list_del(&OCFS_I(inode)->ip_handle_list);
@@ -926,7 +926,7 @@
/* we just changed this but extend_system_file doesn't know
* about oins, so we update alloc_size ourselves. */
- OCFS_I(inode)->alloc_size = alloc_size;
+ OCFS_I(inode)->ip_alloc_size = alloc_size;
/* add this node to openmap and update disk lock */
status = ocfs_update_disk_lock (osb,
@@ -938,9 +938,9 @@
LOG_ERROR_STATUS(status);
goto done;
}
- OCFS_I(inode)->open_hndl_cnt++;
- LOG_TRACE_ARGS("inode->alloc_size = %llu\n",
- OCFS_I(inode)->alloc_size);
+ OCFS_I(inode)->ip_open_cnt++;
+ LOG_TRACE_ARGS("inode->ip_alloc_size = %llu\n",
+ OCFS_I(inode)->ip_alloc_size);
up_write(&OCFS_I(inode)->ip_io_sem);
@@ -976,7 +976,7 @@
brelse(bh);
}
if (inode) {
- OCFS_I(inode)->open_hndl_cnt--;
+ OCFS_I(inode)->ip_open_cnt--;
iput(inode);
}
}
@@ -1042,7 +1042,7 @@
/* Shutdown the kernel journal system */
journal_destroy(journal->k_journal);
- OCFS_I(inode)->open_hndl_cnt--;
+ OCFS_I(inode)->ip_open_cnt--;
down_write(&OCFS_I(inode)->ip_io_sem);
/* unlock our journal */
@@ -1164,7 +1164,7 @@
goto bail;
}
- map = &(OCFS_I(inode)->map);
+ map = &(OCFS_I(inode)->ip_ext_map);
spin_lock(&(map->lock));
numruns = map->count;
spin_unlock(&(map->lock));
@@ -1367,7 +1367,7 @@
/* gonna need this later */
alloc_size = (u64)fe->i_clusters << osb->s_clustersize_bits;
- OCFS_I(inode)->alloc_size = alloc_size;
+ OCFS_I(inode)->ip_alloc_size = alloc_size;
/* add this node to openmap and update disk lock */
down_write(&OCFS_I(inode)->ip_io_sem);
Modified: trunk/src/lockres.c
===================================================================
--- trunk/src/lockres.c 2004-06-18 02:56:38 UTC (rev 1144)
+++ trunk/src/lockres.c 2004-06-18 02:57:54 UTC (rev 1145)
@@ -74,7 +74,7 @@
b = (bh == NULL) ? &tmpbh : bh;
if (reread) {
- flags = (inode && OCFS_I(inode)->flags & OCFS_INODE_SYSTEM_FILE) ?
+ flags = (inode && OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE) ?
0 : lockres->master_node_num == osb->node_num ?
OCFS_BH_CACHED : 0;
status = ocfs_read_bh(osb, lock_id, b, flags, inode);
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-06-18 02:56:38 UTC (rev 1144)
+++ trunk/src/namei.c 2004-06-18 02:57:54 UTC (rev 1145)
@@ -928,7 +928,7 @@
goto bail;
}
- if (OCFS_I(old_inode)->open_hndl_cnt != 0) {
+ if (OCFS_I(old_inode)->ip_open_cnt != 0) {
status = -EBUSY;
goto bail;
}
@@ -1610,7 +1610,7 @@
sb = dir->i_sb;
nblocks = dir->i_size >> sb->s_blocksize_bits;
- start = OCFS_I(dir)->i_dir_start_lookup;
+ start = OCFS_I(dir)->ip_dir_start_lookup;
if (start >= nblocks)
start = 0;
block = start;
@@ -1655,7 +1655,7 @@
i = search_dirblock(bh, dir, name, namelen,
block << sb->s_blocksize_bits, res_dir);
if (i == 1) {
- OCFS_I(dir)->i_dir_start_lookup = block;
+ OCFS_I(dir)->ip_dir_start_lookup = block;
ret = bh;
goto cleanup_and_exit;
} else {
Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c 2004-06-18 02:56:38 UTC (rev 1144)
+++ trunk/src/nm.c 2004-06-18 02:57:54 UTC (rev 1145)
@@ -54,7 +54,7 @@
/* Tracing */
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_NM
-/* for lack of a better name... protects inode_private->num_extends. */
+/* for lack of a better name... protects inode_private->ip_num_extends. */
spinlock_t oin_num_ext_lock = SPIN_LOCK_UNLOCKED;
struct semaphore recovery_list_sem;
@@ -566,33 +566,33 @@
__u32 node_num)
{
- down(&OCFS_I(inode)->priv_sem);
+ down(&OCFS_I(inode)->ip_sem);
/* if we don't have it open, then don't bother with this. */
- if (!OCFS_I(inode)->open_hndl_cnt) {
- up(&OCFS_I(inode)->priv_sem);
+ if (!OCFS_I(inode)->ip_open_cnt) {
+ up(&OCFS_I(inode)->ip_sem);
return;
}
spin_lock(&oin_num_ext_lock);
- if (OCFS_I(inode)->num_extends < 0)
+ if (OCFS_I(inode)->ip_num_extends < 0)
BUG();
/* this isn't the 1st extend against the inode, so just inc
* the counter. */
- if (OCFS_I(inode)->num_extends > 0) {
- OCFS_I(inode)->num_extends++;
+ if (OCFS_I(inode)->ip_num_extends > 0) {
+ OCFS_I(inode)->ip_num_extends++;
spin_unlock(&oin_num_ext_lock);
- up(&OCFS_I(inode)->priv_sem);
+ up(&OCFS_I(inode)->ip_sem);
return;
}
/* ok, we're going to have to take the extend sem. We can't do
- * this holding priv_sem so we drop it and recheck after we've
+ * this holding ip_sem so we drop it and recheck after we've
* got it. */
spin_unlock(&oin_num_ext_lock);
- up(&OCFS_I(inode)->priv_sem);
+ up(&OCFS_I(inode)->ip_sem);
/* take the extend_sem on behalf of
* this other node. It won't be
@@ -601,12 +601,12 @@
* effect of locking out
* lookup_file_allocation on this
* inode. */
- down_write(&OCFS_I(inode)->inode_extend_sem);
+ down_write(&OCFS_I(inode)->ip_extend_sem);
- down(&OCFS_I(inode)->priv_sem);
- if (!OCFS_I(inode)->open_hndl_cnt) {
- up_write(&OCFS_I(inode)->inode_extend_sem);
- up(&OCFS_I(inode)->priv_sem);
+ down(&OCFS_I(inode)->ip_sem);
+ if (!OCFS_I(inode)->ip_open_cnt) {
+ up_write(&OCFS_I(inode)->ip_extend_sem);
+ up(&OCFS_I(inode)->ip_sem);
return;
}
@@ -616,13 +616,13 @@
* list in case the extending node dies. */
down(&recovery_list_sem);
spin_lock(&oin_num_ext_lock);
- OCFS_I(inode)->num_extends++;
- list_add_tail(&OCFS_I(inode)->recovery_list,
+ OCFS_I(inode)->ip_num_extends++;
+ list_add_tail(&OCFS_I(inode)->ip_recovery_list,
&osb->lock_recovery_lists[node_num]);
spin_unlock(&oin_num_ext_lock);
up(&recovery_list_sem);
- up(&OCFS_I(inode)->priv_sem);
+ up(&OCFS_I(inode)->ip_sem);
return;
}
@@ -631,26 +631,26 @@
{
int dec = 0;
- down(&OCFS_I(inode)->priv_sem);
+ down(&OCFS_I(inode)->ip_sem);
/* if we no longer have it open, then the close path has dealt
* with this. */
- if (!OCFS_I(inode)->open_hndl_cnt)
+ if (!OCFS_I(inode)->ip_open_cnt)
goto done;
down(&recovery_list_sem);
spin_lock(&oin_num_ext_lock);
- OCFS_I(inode)->num_extends--;
+ OCFS_I(inode)->ip_num_extends--;
- if (OCFS_I(inode)->num_extends < 0)
+ if (OCFS_I(inode)->ip_num_extends < 0)
BUG();
- if (!OCFS_I(inode)->num_extends) {
- list_del(&OCFS_I(inode)->recovery_list);
- INIT_LIST_HEAD(&OCFS_I(inode)->recovery_list);
+ if (!OCFS_I(inode)->ip_num_extends) {
+ list_del(&OCFS_I(inode)->ip_recovery_list);
+ INIT_LIST_HEAD(&OCFS_I(inode)->ip_recovery_list);
- up_write(&OCFS_I(inode)->inode_extend_sem);
+ up_write(&OCFS_I(inode)->ip_extend_sem);
dec = 1;
}
@@ -659,7 +659,7 @@
up(&recovery_list_sem);
done:
- up(&OCFS_I(inode)->priv_sem);
+ up(&OCFS_I(inode)->ip_sem);
/* we want iputs to happen outside of as many locks as possible. */
if (dec)
@@ -928,18 +928,18 @@
inode->i_nlink = 0;
}
- down (&(OCFS_I(inode)->priv_sem));
+ down (&(OCFS_I(inode)->ip_sem));
/* vote no if the file is still open. */
- if (OCFS_I(inode)->open_hndl_cnt > 0) {
+ if (OCFS_I(inode)->ip_open_cnt > 0) {
vote_response = FLAG_VOTE_OIN_ALREADY_INUSE;
- up(&(OCFS_I(inode)->priv_sem));
+ up(&(OCFS_I(inode)->ip_sem));
goto delete_vote_no;
}
- up(&(OCFS_I(inode)->priv_sem));
+ up(&(OCFS_I(inode)->ip_sem));
/* vote no if someone's extending it. */
spin_lock(&oin_num_ext_lock);
- if (OCFS_I(inode)->num_extends) {
+ if (OCFS_I(inode)->ip_num_extends) {
spin_unlock(&oin_num_ext_lock);
vote_response = FLAG_VOTE_OIN_ALREADY_INUSE;
goto delete_vote_no;
@@ -952,7 +952,7 @@
/* if we vote yes, then we set the SKIP_DELETE
* flag on the inode so we don't try to delete
* it in delete_inode ourselves. */
- OCFS_SET_FLAG(OCFS_I(inode)->flags,
+ OCFS_SET_FLAG(OCFS_I(inode)->ip_flags,
OCFS_INODE_SKIP_DELETE);
inode->i_nlink = 0;
@@ -1086,7 +1086,7 @@
is_locked = DISK_LOCK(fe)->dl_level > OCFS_DLM_NO_LOCK;
if (vote_type == CHANGE_MASTER) {
fe = (ocfs2_dinode *) fe_bh->b_data;
- if (inode && OCFS_I(inode)->open_hndl_cnt) {
+ if (inode && OCFS_I(inode)->ip_open_cnt) {
ocfs_node_map_init(osb, &disk_map);
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe), &disk_map);
ocfs_node_map_set_bit(&disk_map, osb->node_num);
@@ -1204,7 +1204,7 @@
case REMASTER_REQUESTOR:
LOG_TRACE_STR("REMASTER_REQUESTOR");
vote_response = FLAG_VOTE_NODE;
- if (inode && OCFS_I(inode)->open_hndl_cnt
+ if (inode && OCFS_I(inode)->ip_open_cnt
&& flags & (FLAG_FILE_EXTEND|FLAG_FILE_UPDATE)
&& !(flags & FLAG_DIR))
open_handle = 1;
@@ -1340,16 +1340,16 @@
start:
down(&recovery_list_sem);
list_for_each_safe (iter, temp, &osb->lock_recovery_lists[node_num]) {
- i = list_entry (iter, ocfs_inode_private, recovery_list);
+ i = list_entry (iter, ocfs_inode_private, ip_recovery_list);
- inode = i->inode;
+ inode = i->ip_inode;
spin_lock(&oin_num_ext_lock);
- if (OCFS_I(inode)->num_extends) {
- OCFS_I(inode)->num_extends = 0;
- list_del(&OCFS_I(inode)->recovery_list);
- INIT_LIST_HEAD(&OCFS_I(inode)->recovery_list);
- up_write(&OCFS_I(inode)->inode_extend_sem);
+ if (OCFS_I(inode)->ip_num_extends) {
+ OCFS_I(inode)->ip_num_extends = 0;
+ list_del(&OCFS_I(inode)->ip_recovery_list);
+ INIT_LIST_HEAD(&OCFS_I(inode)->ip_recovery_list);
+ up_write(&OCFS_I(inode)->ip_extend_sem);
spin_unlock(&oin_num_ext_lock);
up (&recovery_list_sem);
Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h 2004-06-18 02:56:38 UTC (rev 1144)
+++ trunk/src/ocfs.h 2004-06-18 02:57:54 UTC (rev 1145)
@@ -550,17 +550,17 @@
{
/* inode and feoff fields never change and are always safe to
* read. */
- struct inode *inode;
+ struct inode *ip_inode;
- __u64 feoff;
+ __u64 ip_feoff;
- /* These fields are protected by priv_sem */
- struct semaphore priv_sem;
- __u32 open_hndl_cnt;
- __u64 chng_seq_num;
- ocfs_extent_map map;
- __s64 alloc_size;
- __u32 oin_flags;
+ /* These fields are protected by ip_sem */
+ struct semaphore ip_sem;
+ __u32 ip_open_cnt;
+ __u64 ip_chng_seq_num;
+ ocfs_extent_map ip_ext_map;
+ __s64 ip_alloc_size;
+ __u32 ip_open_flags;
atomic_t ip_needs_verification;
@@ -576,14 +576,14 @@
struct list_head ip_handle_list;
struct _ocfs_journal_handle *ip_handle;
- /* inode_extend_sem locks out extends on behalf of other nodes. */
- struct rw_semaphore inode_extend_sem;
+ /* ip_extend_sem locks out extends on behalf of other nodes. */
+ struct rw_semaphore ip_extend_sem;
- struct list_head recovery_list; /* protected by recovery_list_sem */
- __u32 num_extends; /* protected by oin_num_ext_lock */
+ struct list_head ip_recovery_list;/* protected by recovery_list_sem */
+ __u32 ip_num_extends; /* protected by oin_num_ext_lock */
- atomic_t i_clean_buffer_seq;
- __u32 flags; /* see below */
+ atomic_t ip_clean_buffer_seq;
+ __u32 ip_flags; /* see below */
/* stolen right off of ocfs2_dinode */
union {
@@ -595,14 +595,13 @@
} ip_bitinfo;
} u;
- ocfs_lock_res i_lockres;
- __u32 i_dir_start_lookup;
+ ocfs_lock_res ip_lockres;
+ __u32 ip_dir_start_lookup;
} ocfs_inode_private;
-/* Eventually, the 'flags' and 'oin_flags' fields need to be
+/* Eventually, the 'flags' and 'open_flags' fields need to be
* merged. */
-/* oin_flags flags */
-#define OCFS_OIN_DIRECTORY (0x00000002)
+/* open flags */
#define OCFS_OIN_OPEN_FOR_DIRECTIO (0x00000008)
#define OCFS_OIN_OPEN_FOR_WRITE (0x00000010)
@@ -620,28 +619,28 @@
#define OCFS_I(i) ((ocfs_inode_private *)(i->u.generic_ip))
-#define GET_INODE_CLEAN_SEQ(i) (atomic_t *)(&(OCFS_I(i)->i_clean_buffer_seq))
+#define GET_INODE_CLEAN_SEQ(i) (atomic_t *)(&(OCFS_I(i)->ip_clean_buffer_seq))
-#define IS_SYSTEM_FILE_INODE(i) ((i) && (OCFS_I(i)->flags & OCFS_INODE_SYSTEM_FILE))
+#define IS_SYSTEM_FILE_INODE(i) ((i) && (OCFS_I(i)->ip_flags & OCFS_INODE_SYSTEM_FILE))
-#define INODE_DELETED(i) (OCFS_I(i)->flags & OCFS_INODE_DELETED)
-#define SET_INODE_DELETED(i) (OCFS_I(i)->flags |= OCFS_INODE_DELETED)
-#define CLEAR_INODE_DELETED(i) (OCFS_I(i)->flags &= (~OCFS_INODE_DELETED))
+#define INODE_DELETED(i) (OCFS_I(i)->ip_flags & OCFS_INODE_DELETED)
+#define SET_INODE_DELETED(i) (OCFS_I(i)->ip_flags |= OCFS_INODE_DELETED)
+#define CLEAR_INODE_DELETED(i) (OCFS_I(i)->ip_flags &= (~OCFS_INODE_DELETED))
-#define INODE_JOURNAL(i) (OCFS_I(i)->flags & OCFS_INODE_JOURNAL)
-#define SET_INODE_JOURNAL(i) (OCFS_I(i)->flags |= OCFS_INODE_JOURNAL)
-#define CLEAR_INODE_JOURNAL(i) (OCFS_I(i)->flags &= (~OCFS_INODE_JOURNAL))
+#define INODE_JOURNAL(i) (OCFS_I(i)->ip_flags & OCFS_INODE_JOURNAL)
+#define SET_INODE_JOURNAL(i) (OCFS_I(i)->ip_flags |= OCFS_INODE_JOURNAL)
+#define CLEAR_INODE_JOURNAL(i) (OCFS_I(i)->ip_flags &= (~OCFS_INODE_JOURNAL))
#define SET_INODE_FEOFF(i,o) \
do { \
- OCFS_I(i)->feoff = o; \
+ OCFS_I(i)->ip_feoff = o; \
} while (0)
-#define GET_INODE_FEOFF(i) OCFS_I(i)->feoff
+#define GET_INODE_FEOFF(i) OCFS_I(i)->ip_feoff
-#define GET_INODE_LOCKRES(i) ({ if (i==NULL) BUG(); (&(OCFS_I(i)->i_lockres)); })
+#define GET_INODE_LOCKRES(i) ({ if (i==NULL) BUG(); (&(OCFS_I(i)->ip_lockres)); })
typedef enum _ocfs_vol_state
{
Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c 2004-06-18 02:56:38 UTC (rev 1144)
+++ trunk/src/super.c 2004-06-18 02:57:54 UTC (rev 1145)
@@ -1622,17 +1622,17 @@
}
/* for now, just one extent... but in the future... */
osb->bitmap_blkno = ret >> osb->sb->s_blocksize_bits;
- osb->bitmap_blocks = OCFS_I(inode)->alloc_size >> osb->sb->s_blocksize_bits;
+ osb->bitmap_blocks = OCFS_I(inode)->ip_alloc_size >> osb->sb->s_blocksize_bits;
osb->num_clusters = OCFS_I(inode)->u.ip_bitinfo.total_bits;
printk("bitmap_blkno=%llu, bitmap_blocks=%llu, num_clusters=%llu\n",
osb->bitmap_blkno, osb->bitmap_blocks, osb->num_clusters);
ocfs_initialize_bitmap(osb->sb, &osb->cluster_bitmap,
osb->num_clusters,
- OCFS_I(inode)->alloc_size << 3);
+ OCFS_I(inode)->ip_alloc_size << 3);
/* read the whole cluster bitmap off disk, even though we only
* need the beginning of it. */
- status = ocfs_read_bhs(osb, ret, OCFS_I(inode)->alloc_size,
+ status = ocfs_read_bhs(osb, ret, OCFS_I(inode)->ip_alloc_size,
osb->cluster_bitmap.chunk, 0, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
More information about the Ocfs2-commits
mailing list