[Ocfs2-commits] jlbec commits r2258 - branches/alloc_inode/fs/ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue May 17 00:48:03 CDT 2005
Author: jlbec
Date: 2005-05-17 00:48:02 -0500 (Tue, 17 May 2005)
New Revision: 2258
Modified:
branches/alloc_inode/fs/ocfs2/alloc.c
branches/alloc_inode/fs/ocfs2/aops.c
branches/alloc_inode/fs/ocfs2/dcache.c
branches/alloc_inode/fs/ocfs2/dir.c
branches/alloc_inode/fs/ocfs2/dlmglue.c
branches/alloc_inode/fs/ocfs2/extent_map.c
branches/alloc_inode/fs/ocfs2/file.c
branches/alloc_inode/fs/ocfs2/inode.c
branches/alloc_inode/fs/ocfs2/journal.c
branches/alloc_inode/fs/ocfs2/localalloc.c
branches/alloc_inode/fs/ocfs2/mmap.c
branches/alloc_inode/fs/ocfs2/namei.c
branches/alloc_inode/fs/ocfs2/ocfs.h
branches/alloc_inode/fs/ocfs2/suballoc.c
branches/alloc_inode/fs/ocfs2/suballoc.h
branches/alloc_inode/fs/ocfs2/super.c
branches/alloc_inode/fs/ocfs2/symlink.c
branches/alloc_inode/fs/ocfs2/vote.c
Log:
o Move ip_blkno and ip_orphaned_slot to ocfs2_inode_info
Modified: branches/alloc_inode/fs/ocfs2/alloc.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/alloc.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/alloc.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -776,7 +776,7 @@
mlog(0, "add %u clusters starting at block %"MLFu64" to "
"inode %"MLFu64"\n",
- new_clusters, start_blk, OCFS_I(inode)->ip_blkno);
+ new_clusters, start_blk, OCFS2_I(inode)->ip_blkno);
fe = (ocfs2_dinode *) fe_bh->b_data;
el = &fe->id2.i_list;
Modified: branches/alloc_inode/fs/ocfs2/aops.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/aops.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/aops.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -62,7 +62,8 @@
goto bail;
}
- status = ocfs_read_block(OCFS2_SB(inode->i_sb), OCFS_I(inode)->ip_blkno,
+ status = ocfs_read_block(OCFS2_SB(inode->i_sb),
+ OCFS2_I(inode)->ip_blkno,
&bh, OCFS_BH_CACHED, inode);
if (status < 0) {
mlog_errno (status);
@@ -180,7 +181,7 @@
mlog(ML_ERROR, "iblock = %llu p_blkno = %"MLFu64" "
"blkno=(%"MLFu64")\n",
(unsigned long long)iblock, p_blkno,
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
}
if (vbo < OCFS_I(inode)->ip_mmu_private)
@@ -193,7 +194,7 @@
vbo,
i_size_read(inode),
OCFS_I(inode)->ip_mmu_private,
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
BUG();
err = -EIO;
goto bail;
Modified: branches/alloc_inode/fs/ocfs2/dcache.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/dcache.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/dcache.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -64,7 +64,7 @@
if (INODE_DELETED(inode)) {
spin_unlock(&OCFS_I(inode)->ip_lock);
mlog(0, "inode (%"MLFu64") deleted, returning false\n",
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
goto bail;
}
spin_unlock(&OCFS_I(inode)->ip_lock);
@@ -72,7 +72,7 @@
#warning "should we do this for all files?"
if (S_ISDIR(inode->i_mode) && (!inode->i_nlink)) {
mlog(0, "dir inode (%"MLFu64") orphaned, returning false\n",
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
goto bail;
}
Modified: branches/alloc_inode/fs/ocfs2/dir.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/dir.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/dir.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -83,7 +83,7 @@
struct super_block * sb = inode->i_sb;
int have_disk_lock = 0;
- mlog_entry("dirino=%"MLFu64"\n", OCFS_I(inode)->ip_blkno);
+ mlog_entry("dirino=%"MLFu64"\n", OCFS2_I(inode)->ip_blkno);
stored = 0;
bh = NULL;
@@ -105,7 +105,7 @@
if (!bh) {
mlog(ML_ERROR, "directory #%"MLFu64" contains a hole "
"at offset %lld\n",
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
filp->f_pos);
filp->f_pos += sb->s_blocksize - offset;
continue;
@@ -216,7 +216,7 @@
mlog_entry ("(osb=%p, parent=%"MLFu64", name='%.*s', blkno=%p, "
"inode=%p)\n",
- osb, OCFS_I(inode)->ip_blkno, namelen, name, blkno, inode);
+ osb, OCFS2_I(inode)->ip_blkno, namelen, name, blkno, inode);
if (take_lock) {
/* Get a lock on the directory... */
@@ -273,20 +273,20 @@
!(bh = ocfs_bread (inode, 0, &err, 0))) {
mlog(ML_ERROR, "bad directory (dir #%"MLFu64") - "
"no data block\n",
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
return 1;
}
de = (struct ocfs2_dir_entry *) bh->b_data;
de1 = (struct ocfs2_dir_entry *)
((char *) de + le16_to_cpu(de->rec_len));
- if ((le64_to_cpu(de->inode) != OCFS_I(inode)->ip_blkno) ||
+ if ((le64_to_cpu(de->inode) != OCFS2_I(inode)->ip_blkno) ||
!le64_to_cpu(de1->inode) ||
strcmp (".", de->name) ||
strcmp ("..", de1->name)) {
mlog(ML_ERROR, "bad directory (dir #%"MLFu64") - "
"no `.' or `..'\n",
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
brelse (bh);
return 1;
}
@@ -300,7 +300,7 @@
if (!bh) {
mlog(ML_ERROR, "directory #%"MLFu64" contains "
"a hole at offset %lu\n",
- OCFS_I(inode)->ip_blkno, offset);
+ OCFS2_I(inode)->ip_blkno, offset);
offset += sb->s_blocksize;
continue;
}
@@ -391,7 +391,7 @@
dir_i_size = i_size_read(dir);
mlog(0, "extending dir %"MLFu64" (i_size = %lld)\n",
- OCFS_I(dir)->ip_blkno, dir_i_size);
+ OCFS2_I(dir)->ip_blkno, dir_i_size);
handle = ocfs_alloc_handle(osb);
if (handle == NULL) {
@@ -515,7 +515,7 @@
mlog_entry_void();
mlog(0, "getting ready to insert namelen %d into dir %"MLFu64"\n",
- namelen, OCFS_I(dir)->ip_blkno);
+ namelen, OCFS2_I(dir)->ip_blkno);
OCFS_ASSERT(S_ISDIR(dir->i_mode));
fe = (ocfs2_dinode *) parent_fe_bh->b_data;
Modified: branches/alloc_inode/fs/ocfs2/dlmglue.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/dlmglue.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/dlmglue.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -336,7 +336,7 @@
res->l_ops = &ocfs2_inode_data_lops;
status = ocfs2_build_lock_name(type,
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
inode->i_generation,
&res->l_name);
if (status < 0) {
@@ -586,7 +586,7 @@
osb = OCFS2_SB(inode->i_sb);
mlog(0, "AST fired for inode %"MLFu64", l_action = %u, type = %s\n",
- OCFS_I(inode)->ip_blkno, lockres->l_action,
+ OCFS2_I(inode)->ip_blkno, lockres->l_action,
(lockres->l_type == OCFS_TYPE_META) ? "Meta" : "Data");
OCFS_ASSERT(ocfs2_is_inode_lock(lockres));
@@ -600,7 +600,7 @@
mlog(ML_ERROR, "ocfs2_inode_ast_func: lksb status value of %u "
"on inode %"MLFu64"\n",
lksb->status,
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
spin_unlock(&lockres->l_lock);
mlog_exit_void();
return;
@@ -682,7 +682,7 @@
osb = OCFS2_SB(inode->i_sb);
mlog(0, "BAST fired for inode %"MLFu64", blocking = %d, level = %d "
- "type = %s\n", OCFS_I(inode)->ip_blkno, level,
+ "type = %s\n", OCFS2_I(inode)->ip_blkno, level,
lockres->l_level,
(lockres->l_type == OCFS_TYPE_META) ? "Meta" : "Data");
@@ -1125,7 +1125,7 @@
mlog_entry_void();
mlog(0, "inode %"MLFu64" take %s DATA lock\n",
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
write ? "EXMODE" : "PRMODE");
lockres = &OCFS_I(inode)->ip_data_lockres;
@@ -1181,7 +1181,7 @@
mlog_entry_void();
mlog(0, "inode %"MLFu64" drop %s DATA lock\n",
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
write ? "EXMODE" : "PRMODE");
ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);
@@ -1368,9 +1368,11 @@
spin_lock(&OCFS_I(inode)->ip_lock);
if (INODE_DELETED(inode))
- mlog(ML_ERROR, "Orphaned inode %"MLFu64"was deleted while we "
+ mlog(ML_ERROR,
+ "Orphaned inode %"MLFu64"was deleted while we "
"were waiting on a lock. ip_flags = 0x%x\n",
- OCFS_I(inode)->ip_blkno, OCFS_I(inode)->ip_flags);
+ OCFS2_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_flags);
spin_unlock(&OCFS_I(inode)->ip_lock);
lockres = &OCFS_I(inode)->ip_meta_lockres;
@@ -1387,7 +1389,7 @@
/* Boo, we have to go to disk. */
/* read bh, cast, ocfs_refresh_inode */
status = ocfs_read_block(OCFS2_SB(inode->i_sb),
- OCFS_I(inode)->ip_blkno, bh,
+ OCFS2_I(inode)->ip_blkno, bh,
OCFS_BH_CACHED, inode);
if (status < 0) {
mlog_errno(status);
@@ -1402,19 +1404,19 @@
le32_to_cpu(fe->i_generation),
"Invalid dinode %"MLFu64" disk generation: %u "
"inode->i_generation: %u\n",
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
le32_to_cpu(fe->i_generation),
inode->i_generation);
mlog_bug_on_msg(fe->i_dtime || !(fe->i_flags & OCFS2_VALID_FL),
"Stale dinode %"MLFu64" dtime: %"MLFu64" "
- "flags: 0x%x\n", OCFS_I(inode)->ip_blkno,
+ "flags: 0x%x\n", OCFS2_I(inode)->ip_blkno,
fe->i_dtime, fe->i_flags);
ocfs_refresh_inode(inode, fe);
}
mlog(0, "inode %"MLFu64", I can only trust %u clusters\n",
- OCFS_I(inode)->ip_blkno, trustable_clusters);
+ OCFS2_I(inode)->ip_blkno, trustable_clusters);
/* will do nothing for inode types that don't use the extent
* map (directories, bitmap files, etc) */
@@ -1447,7 +1449,7 @@
}
status = ocfs_read_block(OCFS2_SB(inode->i_sb),
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
ret_bh,
OCFS_BH_CACHED,
inode);
@@ -1479,7 +1481,7 @@
mlog_entry_void();
mlog(0, "inode %"MLFu64", take %s META lock\n",
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
ex ? "EXMODE" : "PRMODE");
status = 0;
@@ -1576,7 +1578,7 @@
if (ret_bh && !(*ret_bh)) {
/* caller wants a buffer head but we haven't read it yet. */
status = ocfs_read_block(OCFS2_SB(inode->i_sb),
- OCFS_I(inode)->ip_blkno, ret_bh,
+ OCFS2_I(inode)->ip_blkno, ret_bh,
OCFS_BH_CACHED, inode);
if (status < 0) {
mlog_errno(status);
@@ -1608,7 +1610,7 @@
mlog_entry_void();
mlog(0, "inode %"MLFu64" drop %s META lock\n",
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
ex ? "EXMODE" : "PRMODE");
ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);
@@ -2198,7 +2200,7 @@
if (filemap_fdatawrite(mapping)) {
mlog(ML_ERROR, "Could not sync inode %"MLFu64" for downconvert!",
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
}
sync_mapping_buffers(mapping);
if (blocking == LKM_EXMODE) {
@@ -2230,7 +2232,7 @@
inode = ocfs2_lock_res_inode(lockres);
osb = OCFS2_SB(inode->i_sb);
- mlog(0, "unblock inode %"MLFu64"\n", OCFS_I(inode)->ip_blkno);
+ mlog(0, "unblock inode %"MLFu64"\n", OCFS2_I(inode)->ip_blkno);
status = ocfs2_generic_unblock_lock(osb,
lockres,
@@ -2240,7 +2242,7 @@
mlog_errno(status);
mlog(0, "inode %"MLFu64", requeue = %d\n",
- OCFS_I(inode)->ip_blkno, *requeue);
+ OCFS2_I(inode)->ip_blkno, *requeue);
/* because of inode ref counting, we never want to propagate
* up requeue requests for inode locks. Instead we do it
@@ -2266,14 +2268,14 @@
inode = ocfs2_lock_res_inode(lockres);
- mlog(0, "unblock inode %"MLFu64"\n", OCFS_I(inode)->ip_blkno);
+ mlog(0, "unblock inode %"MLFu64"\n", OCFS2_I(inode)->ip_blkno);
status = ocfs2_do_unblock_meta(inode, requeue);
if (status < 0)
mlog_errno(status);
mlog(0, "inode %"MLFu64", requeue = %d\n",
- OCFS_I(inode)->ip_blkno, *requeue);
+ OCFS2_I(inode)->ip_blkno, *requeue);
/* if you're confused by this, see the comment in
* ocfs2_unblock_data */
@@ -2359,7 +2361,7 @@
if (!igrab(inode)) {
mlog(0, "Inode %"MLFu64" asked to be scheduled during "
- "clear_inode!\n", OCFS_I(inode)->ip_blkno);
+ "clear_inode!\n", OCFS2_I(inode)->ip_blkno);
return;
}
Modified: branches/alloc_inode/fs/ocfs2/extent_map.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/extent_map.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/extent_map.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -294,7 +294,7 @@
spin_unlock(&OCFS_I(inode)->ip_lock);
ret = ocfs_read_block(OCFS2_SB(inode->i_sb),
- OCFS_I(inode)->ip_blkno, &bh,
+ OCFS2_I(inode)->ip_blkno, &bh,
OCFS_BH_CACHED, inode);
if (ret) {
if (bh)
Modified: branches/alloc_inode/fs/ocfs2/file.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/file.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/file.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -174,7 +174,7 @@
unsigned should_zero)
{
mlog(0, "inode %"MLFu64", newsize = %"MLFu64" should_zero = %u\n",
- OCFS_I(inode)->ip_blkno, newsize, should_zero);
+ OCFS2_I(inode)->ip_blkno, newsize, should_zero);
ocfs2_update_inode_size(inode, newsize);
@@ -446,11 +446,11 @@
ocfs2_truncate_context *tc = NULL;
mlog_entry("(inode = %"MLFu64", new_i_size = %"MLFu64"\n",
- OCFS_I(inode)->ip_blkno, new_i_size);
+ OCFS2_I(inode)->ip_blkno, new_i_size);
truncate_inode_pages(inode->i_mapping, new_i_size);
- status = ocfs_read_block(osb, OCFS_I(inode)->ip_blkno, &fe_bh,
+ status = ocfs_read_block(osb, OCFS2_I(inode)->ip_blkno, &fe_bh,
OCFS_BH_CACHED, inode);
if (status < 0) {
mlog_errno(status);
@@ -658,7 +658,7 @@
block = ocfs2_clusters_to_blocks(osb->sb, bit_off);
mlog(0, "Allocating %u clusters at block %u for inode %"MLFu64"\n",
- num_bits, bit_off, OCFS_I(inode)->ip_blkno);
+ num_bits, bit_off, OCFS2_I(inode)->ip_blkno);
status = ocfs2_insert_extent(osb, handle, inode, fe_bh, block,
num_bits, meta_ac);
if (status < 0) {
@@ -735,7 +735,7 @@
goto leave;
}
- status = ocfs_read_block(osb, OCFS_I(inode)->ip_blkno, &bh,
+ status = ocfs_read_block(osb, OCFS2_I(inode)->ip_blkno, &bh,
OCFS_BH_CACHED, inode);
if (status < 0) {
mlog_errno(status);
@@ -755,7 +755,7 @@
mlog(0, "extend inode %"MLFu64", new_i_size = %"MLFu64", "
"i_size = %lld, fe->i_clusters = %u, clusters_to_add = %u\n",
- OCFS_I(inode)->ip_blkno, new_i_size, i_size_read(inode),
+ OCFS2_I(inode)->ip_blkno, new_i_size, i_size_read(inode),
fe->i_clusters, clusters_to_add);
if (!clusters_to_add)
@@ -1009,8 +1009,10 @@
&& status != -ENOSPC
&& status != -EINTR
&& status != -ERESTARTSYS)
- mlog(ML_ERROR, "status return of %d extending inode "
- "%"MLFu64"\n", status, OCFS_I(inode)->ip_blkno);
+ mlog(ML_ERROR,
+ "status return of %d extending inode "
+ "%"MLFu64"\n", status,
+ OCFS2_I(inode)->ip_blkno);
status = 0;
newsize = bytes_added + i_size_read(inode);
Modified: branches/alloc_inode/fs/ocfs2/inode.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/inode.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/inode.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -133,7 +133,7 @@
bail:
if (inode)
mlog(0, "returning inode with number %"MLFu64"\n",
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
mlog_exit_ptr(inode);
@@ -227,7 +227,6 @@
/* These should be set in read_inode2. */
i->ip_clusters = 0;
- i->ip_blkno = 0ULL;
i->ip_mmu_private = 0LL;
i->ip_flags |= OCFS_INODE_INITIALIZED;
@@ -293,11 +292,14 @@
inode->i_mtime.tv_sec = fe->i_mtime;
inode->i_ctime.tv_sec = fe->i_ctime;
- OCFS_I(inode)->ip_blkno = fe->i_blkno;
+ if (OCFS2_I(inode)->ip_blkno != fe->i_blkno)
+ mlog(ML_ERROR,
+ "ip_blkno %"MLFu64" != i_blkno %"MLFu64"!\n",
+ OCFS2_I(inode)->ip_blkno, fe->i_blkno);
OCFS_I(inode)->ip_clusters = fe->i_clusters;
OCFS_I(inode)->ip_inode = inode;
- OCFS_I(inode)->ip_orphaned_slot = OCFS_INVALID_NODE_NUM;
+ OCFS2_I(inode)->ip_orphaned_slot = OCFS_INVALID_NODE_NUM;
if (create_ino)
inode->i_ino = ino_from_blkno(inode->i_sb, fe->i_blkno);
@@ -578,7 +580,7 @@
}
spin_lock(&OCFS_I(inode)->ip_lock);
- orphaned_slot = OCFS_I(inode)->ip_orphaned_slot;
+ orphaned_slot = OCFS2_I(inode)->ip_orphaned_slot;
spin_unlock(&OCFS_I(inode)->ip_lock);
if (orphaned_slot == OCFS_INVALID_NODE_NUM) {
@@ -587,7 +589,7 @@
* recovery knows how to clean it up so we can safely
* ignore this inode for now on. */
mlog(0, "Nobody knew where inode %"MLFu64" was orphaned!\n",
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
/* XXX: Is this really necessary? */
spin_lock(&OCFS_I(inode)->ip_lock);
@@ -597,7 +599,7 @@
}
mlog(0, "Inode %"MLFu64" is ok to wipe from orphan dir slot %d\n",
- OCFS_I(inode)->ip_blkno, orphaned_slot);
+ OCFS2_I(inode)->ip_blkno, orphaned_slot);
fe = (ocfs2_dinode *) fe_bh->b_data;
if (!(fe->i_flags & OCFS2_ORPHANED_FL)) {
@@ -739,7 +741,7 @@
goto bail;
mlog(0, "Clearing inode: %"MLFu64", nlink = %u)\n",
- OCFS_I(inode)->ip_blkno, inode->i_nlink);
+ OCFS2_I(inode)->ip_blkno, inode->i_nlink);
/* we should not really be using osb in this context. */
osb = OCFS2_SB(inode->i_sb);
@@ -755,14 +757,14 @@
if (!INODE_DELETED(inode))
ocfs2_checkpoint_inode(inode);
- if (OCFS_I(inode)->ip_blkno == -1)
+ if (OCFS2_I(inode)->ip_blkno == -1)
BUG();
OCFS_ASSERT(list_empty(&OCFS_I(inode)->ip_io_markers));
/* blkno == 0 if this inode is newly created and hasn't been
* filled in yet. */
- if (OCFS_I(inode)->ip_blkno == 0) {
+ if (OCFS2_I(inode)->ip_blkno == 0) {
mlog(0, "uhm, blkno = 0!\n");
goto bail;
}
@@ -864,7 +866,7 @@
ocfs_super *osb;
mlog_entry("(inode = 0x%p, ino = %"MLFu64")\n", inode,
- inode ? OCFS_I(inode)->ip_blkno : 0ULL);
+ inode ? OCFS2_I(inode)->ip_blkno : 0ULL);
if (!inode) {
mlog(0, "eep, no inode!\n");
@@ -909,7 +911,7 @@
int status;
ocfs2_dinode *fe = (ocfs2_dinode *) bh->b_data;
- mlog_entry("(inode %"MLFu64")\n", OCFS_I(inode)->ip_blkno);
+ mlog_entry("(inode %"MLFu64")\n", OCFS2_I(inode)->ip_blkno);
status = ocfs_journal_access(handle, inode, bh,
OCFS_JOURNAL_ACCESS_WRITE);
Modified: branches/alloc_inode/fs/ocfs2/journal.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/journal.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/journal.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -486,7 +486,7 @@
ocfs2_meta_unlock(inode, 1);
if (atomic_read(&inode->i_count) == 1)
mlog(ML_ERROR, "Inode %"MLFu64", I'm doing a last iput "
- "for!", OCFS_I(inode)->ip_blkno);
+ "for!", OCFS2_I(inode)->ip_blkno);
iput(inode);
kmem_cache_free(ocfs2_lock_cache, lock);
}
@@ -1420,7 +1420,7 @@
continue;
mlog(0, "queue orphan %"MLFu64"\n",
- OCFS_I(iter)->ip_blkno);
+ OCFS2_I(iter)->ip_blkno);
OCFS_I(iter)->ip_next_orphan = inode;
inode = iter;
}
@@ -1435,12 +1435,13 @@
orphan_dir_inode = NULL;
while (inode) {
- mlog(0, "iput orphan %"MLFu64"\n", OCFS_I(inode)->ip_blkno);
+ mlog(0, "iput orphan %"MLFu64"\n",
+ OCFS2_I(inode)->ip_blkno);
iter = OCFS_I(inode)->ip_next_orphan;
spin_lock(&OCFS_I(inode)->ip_lock);
- OCFS_I(inode)->ip_orphaned_slot = slot;
+ OCFS2_I(inode)->ip_orphaned_slot = slot;
spin_unlock(&OCFS_I(inode)->ip_lock);
iput(inode);
Modified: branches/alloc_inode/fs/ocfs2/localalloc.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/localalloc.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/localalloc.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -134,8 +134,8 @@
mlog_errno(status);
goto bail;
}
- status = ocfs_read_block(osb, OCFS_I(inode)->ip_blkno, &alloc_bh, 0,
- inode);
+ status = ocfs_read_block(osb, OCFS2_I(inode)->ip_blkno,
+ &alloc_bh, 0, inode);
if (status < 0) {
mlog_errno(status);
goto bail;
@@ -145,7 +145,7 @@
if (!(alloc->i_flags & (OCFS2_LOCAL_ALLOC_FL|OCFS2_BITMAP_FL))) {
mlog(ML_ERROR, "Invalid local alloc inode, %"MLFu64"\n",
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
status = -EINVAL;
goto bail;
}
@@ -345,8 +345,8 @@
goto bail;
}
- status = ocfs_read_block(osb, OCFS_I(inode)->ip_blkno, &alloc_bh, 0,
- inode);
+ status = ocfs_read_block(osb, OCFS2_I(inode)->ip_blkno,
+ &alloc_bh, 0, inode);
if (status < 0) {
mlog_errno(status);
goto bail;
Modified: branches/alloc_inode/fs/ocfs2/mmap.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/mmap.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/mmap.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -171,7 +171,7 @@
OCFS_ASSERT(inode);
- return OCFS_I(inode)->ip_blkno;
+ return OCFS2_I(inode)->ip_blkno;
}
static inline struct rb_node * __ocfs2_buffer_lock_ctxt_root(
@@ -192,7 +192,7 @@
OCFS_ASSERT(ctxt);
OCFS_ASSERT(inode);
- blkno = OCFS_I(inode)->ip_blkno;
+ blkno = OCFS2_I(inode)->ip_blkno;
while(*p) {
parent = *p;
@@ -547,7 +547,7 @@
* level cluster lock. */
mlog(0, "inode %"MLFu64", had a PR, looping back "
"for EX\n",
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
ocfs2_meta_unlock(inode, level);
info->wl_have_target_meta = 0;
level = 1;
@@ -570,7 +570,7 @@
mlog_errno(status);
mlog(ML_ERROR, "Failed to extend inode %"MLFu64
" from %lld to %"MLFu64,
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
*ppos, info->wl_newsize);
}
ret = status;
@@ -594,7 +594,8 @@
&& status != -EINTR
&& status != -ERESTARTSYS)
mlog(ML_ERROR, "status return of %d extending inode "
- "%"MLFu64"\n", status, OCFS_I(inode)->ip_blkno);
+ "%"MLFu64"\n", status,
+ OCFS2_I(inode)->ip_blkno);
status = 0;
}
@@ -648,7 +649,7 @@
inode = binode->ba_inode;
printk("(%u) ocfs2: inode %llu, locked %d, is target? %s\n",
- current->pid, OCFS_I(inode)->ip_blkno,
+ current->pid, OCFS2_I(inode)->ip_blkno,
binode->ba_locked,
ocfs2_buffer_lock_is_target(ctxt, inode) ? "yes" :
"no");
Modified: branches/alloc_inode/fs/ocfs2/namei.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/namei.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/namei.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -266,14 +266,14 @@
memset(new_bh->b_data, 0, osb->sb->s_blocksize);
de = (struct ocfs2_dir_entry *) new_bh->b_data;
- de->inode = cpu_to_le64(OCFS_I(inode)->ip_blkno);
+ de->inode = cpu_to_le64(OCFS2_I(inode)->ip_blkno);
de->name_len = 1;
de->rec_len =
cpu_to_le16(OCFS2_DIR_REC_LEN(de->name_len));
strcpy (de->name, ".");
ocfs_set_de_type(de, S_IFDIR);
de = (struct ocfs2_dir_entry *) ((char *) de + le16_to_cpu(de->rec_len));
- de->inode = cpu_to_le64(OCFS_I(parent)->ip_blkno);
+ de->inode = cpu_to_le64(OCFS2_I(parent)->ip_blkno);
de->rec_len = cpu_to_le16(inode->i_sb->s_blocksize -
OCFS2_DIR_REC_LEN(1));
de->name_len = 2;
@@ -328,7 +328,7 @@
if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) {
mlog(ML_ERROR, "inode %"MLFu64" has i_nlink of %u\n",
- OCFS_I(dir)->ip_blkno, dir->i_nlink);
+ OCFS2_I(dir)->ip_blkno, dir->i_nlink);
status = -EMLINK;
goto leave;
}
@@ -726,7 +726,8 @@
goto bail;
}
- err = ocfs_add_entry(handle, dentry, inode, OCFS_I(inode)->ip_blkno,
+ err = ocfs_add_entry(handle, dentry, inode,
+ OCFS2_I(inode)->ip_blkno,
parent_fe_bh, de_bh);
if (err) {
fe->i_links_count--;
@@ -776,7 +777,7 @@
OCFS_ASSERT((dentry->d_parent->d_inode == dir));
- mlog(0, "ino = %"MLFu64"\n", OCFS_I(inode)->ip_blkno);
+ mlog(0, "ino = %"MLFu64"\n", OCFS2_I(inode)->ip_blkno);
if (inode == osb->root_inode) {
mlog(0, "Cannot delete the root directory\n");
@@ -807,7 +808,7 @@
goto leave;
}
- if (blkno != OCFS_I(inode)->ip_blkno)
+ if (blkno != OCFS2_I(inode)->ip_blkno)
BUG();
status = ocfs2_meta_lock(inode, handle, &fe_bh, 1);
@@ -941,14 +942,13 @@
struct inode *inode2)
{
int status;
- ocfs_inode_private *oip1 = OCFS_I(inode1);
- ocfs_inode_private *oip2 = OCFS_I(inode2);
+ struct ocfs2_inode_info *oi1 = OCFS2_I(inode1);
+ struct ocfs2_inode_info *oi2 = OCFS2_I(inode2);
struct buffer_head **tmpbh;
struct inode *tmpinode;
mlog_entry("(inode1 = %"MLFu64", inode2 = %"MLFu64")\n",
- OCFS_I(inode1)->ip_blkno,
- OCFS_I(inode2)->ip_blkno);
+ oi1->ip_blkno, oi2->ip_blkno);
OCFS_ASSERT(handle);
@@ -958,8 +958,8 @@
*bh2 = NULL;
/* we always want to lock the one with the lower lockid first. */
- if (oip1->ip_blkno != oip2->ip_blkno) {
- if (oip1->ip_blkno < oip2->ip_blkno) {
+ if (oi1->ip_blkno != oi2->ip_blkno) {
+ if (oi1->ip_blkno < oi2->ip_blkno) {
/* switch id1 and id2 around */
mlog(0, "switching them around...\n");
tmpbh = bh2;
@@ -1093,7 +1093,7 @@
status = -EIO;
if (le64_to_cpu(PARENT_INO(old_inode_de_bh->b_data)) !=
- OCFS_I(old_dir)->ip_blkno)
+ OCFS2_I(old_dir)->ip_blkno)
goto bail;
status = -EMLINK;
if (!new_inode && new_dir!=old_dir &&
@@ -1122,7 +1122,7 @@
* and merrily kill the link to whatever was created under the
* same name. Goodbye sticky bit ;-<
*/
- if (le64_to_cpu(old_de->inode) != OCFS_I(old_inode)->ip_blkno)
+ if (le64_to_cpu(old_de->inode) != OCFS2_I(old_inode)->ip_blkno)
goto bail;
/* check if the target already exists (in which case we need
@@ -1150,7 +1150,7 @@
if (!new_inode)
BUG();
- if (newfe_blkno != OCFS_I(new_inode)->ip_blkno)
+ if (newfe_blkno != OCFS2_I(new_inode)->ip_blkno)
BUG();
status = ocfs2_meta_lock(new_inode, handle, &newfe_bh, 1);
@@ -1233,7 +1233,7 @@
goto bail;
}
new_de->inode =
- le64_to_cpu(OCFS_I(old_inode)->ip_blkno);
+ le64_to_cpu(OCFS2_I(old_inode)->ip_blkno);
new_de->file_type = old_de->file_type;
new_dir->i_version++;
status = ocfs_journal_dirty(handle, new_de_bh);
@@ -1255,7 +1255,7 @@
} else {
/* if the name was not found in new_dir, add it now */
status = ocfs_add_entry (handle, new_dentry, old_inode,
- OCFS_I(old_inode)->ip_blkno,
+ OCFS2_I(old_inode)->ip_blkno,
new_dir_bh, insert_entry_bh);
}
@@ -1279,7 +1279,7 @@
old_inode_de_bh,
OCFS_JOURNAL_ACCESS_WRITE);
PARENT_INO(old_inode_de_bh->b_data) =
- le64_to_cpu(OCFS_I(new_dir)->ip_blkno);
+ le64_to_cpu(OCFS2_I(new_dir)->ip_blkno);
status = ocfs_journal_dirty(handle, old_inode_de_bh);
old_dir->i_nlink--;
if (new_inode) {
@@ -1299,7 +1299,7 @@
mlog(ML_ERROR, "need to change nlink for new "
"dir %"MLFu64" from %d to %d "
"but bh is NULL\n",
- OCFS_I(new_dir)->ip_blkno,
+ OCFS2_I(new_dir)->ip_blkno,
(int)new_dir_nlink, new_dir->i_nlink);
} else {
ocfs2_dinode *fe;
@@ -1318,7 +1318,8 @@
mlog(ML_ERROR, "need to change nlink for old dir "
"%"MLFu64" from %d to %d but bh is "
"NULL!\n",
- OCFS_I(old_dir)->ip_blkno, (int)old_dir_nlink,
+ OCFS2_I(old_dir)->ip_blkno,
+ (int)old_dir_nlink,
old_dir->i_nlink);
} else {
ocfs2_dinode *fe;
@@ -1682,7 +1683,7 @@
if (error_msg != NULL)
mlog(ML_ERROR, "bad entry in directory #%"MLFu64": %s - "
"offset=%lu, inode=%"MLFu64", rec_len=%d, name_len=%d",
- OCFS_I(dir)->ip_blkno, error_msg, offset,
+ OCFS2_I(dir)->ip_blkno, error_msg, offset,
le64_to_cpu(de->inode), rlen, de->name_len);
return error_msg == NULL ? 1 : 0;
}
@@ -2009,7 +2010,7 @@
struct buffer_head *orphan_dir_bh = NULL;
int status = 0;
- status = ocfs_blkno_stringify(OCFS_I(inode)->ip_blkno, name);
+ status = ocfs_blkno_stringify(OCFS2_I(inode)->ip_blkno, name);
if (status < 0) {
mlog_errno(status);
goto leave;
@@ -2074,7 +2075,8 @@
goto leave;
}
- status = ocfs_read_block(osb, OCFS_I(orphan_dir_inode)->ip_blkno,
+ status = ocfs_read_block(osb,
+ OCFS2_I(orphan_dir_inode)->ip_blkno,
&orphan_dir_bh, OCFS_BH_CACHED,
orphan_dir_inode);
if (status < 0) {
@@ -2104,7 +2106,8 @@
status = __ocfs_add_entry(handle, orphan_dir_inode, name,
OCFS2_ORPHAN_NAMELEN, inode,
- OCFS_I(inode)->ip_blkno, orphan_dir_bh,
+ OCFS2_I(inode)->ip_blkno,
+ orphan_dir_bh,
de_bh);
if (status < 0) {
mlog_errno(status);
@@ -2117,11 +2120,11 @@
* in. delete_inode will use this to determine which orphan
* dir to lock. */
spin_lock(&OCFS_I(inode)->ip_lock);
- OCFS_I(inode)->ip_orphaned_slot = osb->slot_num;
+ OCFS2_I(inode)->ip_orphaned_slot = osb->slot_num;
spin_unlock(&OCFS_I(inode)->ip_lock);
mlog(0, "Inode %"MLFu64" orphaned in slot %d\n",
- OCFS_I(inode)->ip_blkno, osb->slot_num);
+ OCFS2_I(inode)->ip_blkno, osb->slot_num);
leave:
if (orphan_dir_inode)
@@ -2147,14 +2150,14 @@
mlog_entry_void();
- status = ocfs_blkno_stringify(OCFS_I(inode)->ip_blkno, name);
+ status = ocfs_blkno_stringify(OCFS2_I(inode)->ip_blkno, name);
if (status < 0) {
mlog_errno(status);
goto leave;
}
mlog(0, "removing '%s' from orphan dir %"MLFu64" (namelen=%d)\n",
- name, OCFS_I(orphan_dir_inode)->ip_blkno, OCFS2_ORPHAN_NAMELEN);
+ name, OCFS2_I(orphan_dir_inode)->ip_blkno, OCFS2_ORPHAN_NAMELEN);
/* find it's spot in the orphan directory */
target_de_bh = ocfs_find_entry(name, OCFS2_ORPHAN_NAMELEN,
Modified: branches/alloc_inode/fs/ocfs2/ocfs.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/ocfs.h 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/ocfs.h 2005-05-17 05:48:02 UTC (rev 2258)
@@ -199,8 +199,6 @@
* read. */
struct inode *ip_inode;
- u64 ip_blkno;
-
ocfs2_lock_res ip_meta_lockres;
ocfs2_lock_res ip_data_lockres;
@@ -213,7 +211,6 @@
loff_t ip_mmu_private;
struct ocfs2_extent_map ip_map;
struct list_head ip_io_markers;
- int ip_orphaned_slot;
struct semaphore ip_io_sem;
Modified: branches/alloc_inode/fs/ocfs2/suballoc.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/suballoc.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/suballoc.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -168,7 +168,7 @@
bg->bg_bits = (u32) cl->cl_cpg * (u32) cl->cl_bpc;
bg->bg_chain = my_chain;
bg->bg_next_group = cl->cl_recs[my_chain].c_blkno;
- bg->bg_parent_dinode = OCFS_I(alloc_inode)->ip_blkno;
+ bg->bg_parent_dinode = OCFS2_I(alloc_inode)->ip_blkno;
bg->bg_blkno = group_blkno;
/* set the 1st bit in the bitmap to account for the descriptor block */
ocfs2_set_bit(0, (unsigned long *) bg->bg_bitmap);
@@ -924,7 +924,7 @@
chain = ac->ac_chain;
mlog(0, "trying to alloc %u bits from chain %u, inode %"MLFu64"\n",
- bits_wanted, chain, OCFS_I(alloc_inode)->ip_blkno);
+ bits_wanted, chain, OCFS2_I(alloc_inode)->ip_blkno);
status = ocfs_read_block(OCFS2_SB(alloc_inode->i_sb),
cl->cl_recs[chain].c_blkno, &group_bh,
@@ -1403,7 +1403,8 @@
mlog(0, "suballocator %"MLFu64": freeing %u bits from group %"MLFu64
", starting at %u\n",
- OCFS_I(alloc_inode)->ip_blkno, count, bg_blkno, start_bit);
+ OCFS2_I(alloc_inode)->ip_blkno, count, bg_blkno,
+ start_bit);
status = ocfs_read_block(osb, bg_blkno, &group_bh, OCFS_BH_CACHED,
alloc_inode);
Modified: branches/alloc_inode/fs/ocfs2/suballoc.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/suballoc.h 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/suballoc.h 2005-05-17 05:48:02 UTC (rev 2258)
@@ -121,7 +121,7 @@
static inline int ocfs2_is_cluster_bitmap(struct inode *inode)
{
ocfs_super *osb = OCFS2_SB(inode->i_sb);
- return osb->bitmap_blkno == OCFS_I(inode)->ip_blkno;
+ return osb->bitmap_blkno == OCFS2_I(inode)->ip_blkno;
}
/* This is for local alloc ONLY. Others should use the task-specific
Modified: branches/alloc_inode/fs/ocfs2/super.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/super.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/super.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -560,7 +560,7 @@
init_rwsem(&oi->ip_alloc_sem);
init_MUTEX(&(oi->ip_io_sem));
- oi->ip_blkno = 0;
+ oi->ip_blkno = 0ULL;
oi->ip_clusters = 0;
oi->ip_mmu_private = 0LL;
@@ -1185,7 +1185,7 @@
goto bail;
}
- osb->bitmap_blkno = OCFS_I(inode)->ip_blkno;
+ osb->bitmap_blkno = OCFS2_I(inode)->ip_blkno;
status = ocfs_read_block(osb, osb->bitmap_blkno, &bitmap_bh, 0, inode);
iput(inode);
Modified: branches/alloc_inode/fs/ocfs2/symlink.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/symlink.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/symlink.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -250,7 +250,7 @@
mlog_entry_void();
status = ocfs_read_block(OCFS2_SB(inode->i_sb),
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
bh,
OCFS_BH_CACHED,
inode);
Modified: branches/alloc_inode/fs/ocfs2/vote.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/vote.c 2005-05-17 03:23:45 UTC (rev 2257)
+++ branches/alloc_inode/fs/ocfs2/vote.c 2005-05-17 05:48:02 UTC (rev 2258)
@@ -168,29 +168,29 @@
if ((*orphaned_slot) != OCFS_INVALID_NODE_NUM) {
spin_lock(&OCFS_I(inode)->ip_lock);
- mlog_bug_on_msg(OCFS_I(inode)->ip_orphaned_slot !=
+ mlog_bug_on_msg(OCFS2_I(inode)->ip_orphaned_slot !=
OCFS_INVALID_NODE_NUM &&
- OCFS_I(inode)->ip_orphaned_slot !=
+ OCFS2_I(inode)->ip_orphaned_slot !=
(*orphaned_slot),
"Inode %"MLFu64": This node thinks it's "
"orphaned in slot %d, messaged it's in %d\n",
- OCFS_I(inode)->ip_blkno,
- OCFS_I(inode)->ip_orphaned_slot,
+ OCFS2_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_orphaned_slot,
*orphaned_slot);
mlog(0, "Setting orphaned slot for inode %"MLFu64" to %d\n",
- OCFS_I(inode)->ip_blkno, *orphaned_slot);
+ OCFS2_I(inode)->ip_blkno, *orphaned_slot);
- OCFS_I(inode)->ip_orphaned_slot = *orphaned_slot;
+ OCFS2_I(inode)->ip_orphaned_slot = *orphaned_slot;
spin_unlock(&OCFS_I(inode)->ip_lock);
} else {
spin_lock(&OCFS_I(inode)->ip_lock);
mlog(0, "Sending back orphaned slot %d for inode %"MLFu64"\n",
- OCFS_I(inode)->ip_orphaned_slot,
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_orphaned_slot,
+ OCFS2_I(inode)->ip_blkno);
- *orphaned_slot = OCFS_I(inode)->ip_orphaned_slot;
+ *orphaned_slot = OCFS2_I(inode)->ip_orphaned_slot;
spin_unlock(&OCFS_I(inode)->ip_lock);
}
@@ -214,7 +214,7 @@
if (filemap_fdatawrite(inode->i_mapping)) {
mlog(ML_ERROR, "Could not sync inode %"MLFu64" for delete!\n",
- OCFS_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
goto done;
}
sync_mapping_buffers(inode->i_mapping);
@@ -690,7 +690,7 @@
if (!ocfs_node_map_is_only(osb, &osb->mounted_map,
osb->node_num))
status = ocfs2_do_request_vote(osb,
- OCFS_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
inode->i_generation,
type,
orphaned_slot,
@@ -710,7 +710,7 @@
orphaned_slot = ntohl(resp->r_orphaned_slot);
node = ntohl(resp->r_hdr.h_node_num);
mlog(0, "node %d tells us that inode %"MLFu64" is orphaned in slot "
- "%d\n", node, OCFS_I(inode)->ip_blkno, orphaned_slot);
+ "%d\n", node, OCFS2_I(inode)->ip_blkno, orphaned_slot);
/* The other node may not actually know which slot the inode
* is orphaned in. */
@@ -722,14 +722,14 @@
* then record this in the inode. ocfs_delete_inode will use
* this information to determine which lock to take. */
spin_lock(&OCFS_I(inode)->ip_lock);
- mlog_bug_on_msg(OCFS_I(inode)->ip_orphaned_slot != orphaned_slot &&
- OCFS_I(inode)->ip_orphaned_slot
+ mlog_bug_on_msg(OCFS2_I(inode)->ip_orphaned_slot != orphaned_slot &&
+ OCFS2_I(inode)->ip_orphaned_slot
!= OCFS_INVALID_NODE_NUM, "Inode %"MLFu64": Node %d "
"says it's orphaned in slot %d, we think it's in %d\n",
- OCFS_I(inode)->ip_blkno, ntohl(resp->r_hdr.h_node_num),
- orphaned_slot, OCFS_I(inode)->ip_orphaned_slot);
+ OCFS2_I(inode)->ip_blkno, ntohl(resp->r_hdr.h_node_num),
+ orphaned_slot, OCFS2_I(inode)->ip_orphaned_slot);
- OCFS_I(inode)->ip_orphaned_slot = orphaned_slot;
+ OCFS2_I(inode)->ip_orphaned_slot = orphaned_slot;
spin_unlock(&OCFS_I(inode)->ip_lock);
}
@@ -739,14 +739,14 @@
struct ocfs2_net_response_cb delete_cb;
spin_lock(&OCFS_I(inode)->ip_lock);
- orphaned_slot = OCFS_I(inode)->ip_orphaned_slot;
+ orphaned_slot = OCFS2_I(inode)->ip_orphaned_slot;
spin_unlock(&OCFS_I(inode)->ip_lock);
delete_cb.rc_cb = ocfs2_delete_response_cb;
delete_cb.rc_priv = inode;
mlog(0, "Inode %"MLFu64", we start thinking orphaned slot is %d\n",
- OCFS_I(inode)->ip_blkno, orphaned_slot);
+ OCFS2_I(inode)->ip_blkno, orphaned_slot);
return ocfs2_request_vote(inode,
OCFS2_VOTE_REQ_DELETE,
More information about the Ocfs2-commits
mailing list