[Ocfs2-commits] jlbec commits r1191 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Jun 22 19:18:57 CDT 2004
Author: jlbec
Date: 2004-06-22 18:18:56 -0500 (Tue, 22 Jun 2004)
New Revision: 1191
Modified:
trunk/src/alloc.c
trunk/src/dcache.c
trunk/src/dir.c
trunk/src/dlm.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
trunk/src/util.c
Log:
o Remove ip_feoff, replacing it with ip_blkno. So we now speak blocks
for inode locations. All places using the byte offset still
(notably, lockid) shift by blocksize_bits.
o Remove GET/SET_INODE_FEOFF()
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/alloc.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -1178,8 +1178,8 @@
u64 parent_blk, new_eb_blkno;
ocfs2_dinode *fe = NULL;
- LOG_ENTRY_ARGS("(blkno=%llu, new_clusters=%u, inode=%llu)\n", blkno, new_clusters,
- GET_INODE_FEOFF(inode));
+ LOG_ENTRY_ARGS("(blkno=%llu, new_clusters=%u, inode=%llu)\n",
+ blkno, new_clusters, OCFS_I(inode)->ip_blkno);
fe = (ocfs2_dinode *) fe_bh->b_data;
OCFS_ASSERT(fe);
@@ -2566,7 +2566,7 @@
int have_io_sem = 0;
LOG_ENTRY_ARGS("(vbo=%llu, blocks=%u, inode=%llu)\n", Vbo, blocks,
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno);
OCFS_ASSERT (osb);
OCFS_ASSERT (inode);
@@ -2634,8 +2634,9 @@
*/
/* Read the file Entry corresponding to this */
- status = ocfs_read_bh(osb, GET_INODE_FEOFF(inode), &fe_bh,
- OCFS_BH_COND_CACHED, inode);
+ status = ocfs_read_bh(osb,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ &fe_bh, OCFS_BH_COND_CACHED, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto finally;
@@ -3183,7 +3184,8 @@
extent = ( ((numBits * blockSize) + (ONE_MEGA_BYTE-1)) >> 20 ) << 20;
#warning maybe take this out and put a verifyupdateinode in here
- status = ocfs_read_bh(osb, GET_INODE_FEOFF(alloc_inode),
+ status = ocfs_read_bh(osb,
+ OCFS_I(alloc_inode)->ip_blkno << alloc_inode->i_sb->s_blocksize_bits,
&alloc_bh, OCFS_BH_CACHED, alloc_inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -3214,7 +3216,7 @@
LOG_TRACE_ARGS("extending the alloc file to %llu\n",
newFileSize + extent);
status = ocfs_extend_file(osb, newFileSize + extent,
- GET_INODE_FEOFF(alloc_inode),
+ OCFS_I(alloc_inode)->ip_blkno << alloc_inode->i_sb->s_blocksize_bits,
handle, alloc_inode, NULL, 1,
NULL);
if (status < 0) {
@@ -3230,8 +3232,9 @@
/* Calculate the new bitmap size */
LOG_TRACE_ARGS("extending the bitmap file to %llu\n", bitMapSize);
- status = ocfs_extend_file (osb, bitMapSize, GET_INODE_FEOFF(inode),
- handle, inode, NULL, 1, bh);
+ status = ocfs_extend_file(osb, bitMapSize,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ handle, inode, NULL, 1, bh);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto leave;
@@ -3334,13 +3337,11 @@
struct buffer_head *extent_bh = NULL;
ocfs2_extent_list *fel;
ocfs2_dinode *fe;
- __u64 offset;
LOG_ENTRY ();
- offset = GET_INODE_FEOFF(inode);
fe = (ocfs2_dinode *) fe_bh->b_data;
- if (offset != (fe->i_blkno << osb->sb->s_blocksize_bits))
+ if (OCFS_I(inode)->ip_blkno != fe->i_blkno)
BUG();
if (inode)
@@ -4024,7 +4025,9 @@
LOG_ERROR_STATUS(status=-EINVAL);
goto bail;
}
- status = ocfs_read_bh(osb, GET_INODE_FEOFF(inode), &alloc_bh, 0, inode);
+ status = ocfs_read_bh(osb,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ &alloc_bh, 0, inode);
if (status < 0) {
LOG_ERROR_STATUS(status);
goto bail;
@@ -4142,7 +4145,9 @@
goto bail;
}
- status = ocfs_read_bh(osb, GET_INODE_FEOFF(inode), &alloc_bh,
+ status = ocfs_read_bh(osb,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ &alloc_bh,
0, inode);
if (status < 0) {
LOG_ERROR_STATUS(status);
Modified: trunk/src/dcache.c
===================================================================
--- trunk/src/dcache.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/dcache.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -70,7 +70,8 @@
/* did we or someone else delete this inode? */
if (INODE_DELETED(inode)) {
LOG_TRACE_ARGS("dentry_revalidate: inode (%llu) deleted, "
- "returning false\n", GET_INODE_FEOFF(inode));
+ "returning false\n",
+ OCFS_I(inode)->ip_blkno);
goto bail;
}
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/dir.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -81,7 +81,7 @@
LOG_SET_CONTEXT(READDIR);
- LOG_ENTRY_ARGS("dirino=%llu\n", GET_INODE_FEOFF(inode));
+ LOG_ENTRY_ARGS("dirino=%llu\n", OCFS_I(inode)->ip_blkno);
stored = 0;
bh = NULL;
@@ -92,7 +92,8 @@
bh = ocfs_bread (0, inode, blk, 0, &err, 0);
if (!bh) {
LOG_ERROR_ARGS ("directory #%llu contains a hole at offset %lu\n",
- GET_INODE_FEOFF(inode), (unsigned long)filp->f_pos);
+ OCFS_I(inode)->ip_blkno,
+ (unsigned long)filp->f_pos);
filp->f_pos += sb->s_blocksize - offset;
continue;
}
@@ -209,7 +210,7 @@
__u32 lock_type = OCFS_DLM_ENABLE_CACHE_LOCK;
LOG_ENTRY_ARGS ("(osb=%p, parent=%llu, name='%*s', fe_off=%p, inode=%p)\n",
- osb, GET_INODE_FEOFF(inode), namelen, name, fe_off, inode);
+ osb, OCFS_I(inode)->ip_blkno, namelen, name, fe_off, inode);
if (take_lock) {
/* Get a lock on the directory... */
@@ -276,21 +277,19 @@
(OCFS2_DIR_REC_LEN(1) + OCFS2_DIR_REC_LEN(2))) ||
!(bh = ocfs_bread (NULL, inode, 0, 0, &err, 0))) {
LOG_ERROR_ARGS ("bad directory (dir #%llu) - no data block\n",
- GET_INODE_FEOFF(inode));
+ OCFS_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));
- /* Argh, should have blkno on inode_private */
- if ((le64_to_cpu(de->inode) !=
- (GET_INODE_FEOFF(inode) >> sb->s_blocksize_bits)) ||
+ if ((le64_to_cpu(de->inode) != OCFS_I(inode)->ip_blkno) ||
!le64_to_cpu(de1->inode) ||
strcmp (".", de->name) ||
strcmp ("..", de1->name)) {
LOG_ERROR_ARGS ("bad directory (dir #%llu) - no `.' or `..'\n",
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno);
brelse (bh);
return 1;
}
@@ -303,7 +302,7 @@
offset >> sb->s_blocksize_bits, 0, &err, 0);
if (!bh) {
LOG_ERROR_ARGS ("directory #%llu contains a hole at offset %lu\n",
- GET_INODE_FEOFF(inode), offset);
+ OCFS_I(inode)->ip_blkno, offset);
offset += sb->s_blocksize;
continue;
}
Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/dlm.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -360,7 +360,8 @@
finally:
if (lockres && status >= 0)
- status = ocfs_update_lockres (osb, &bh, NULL, 0, inode, 0, 0);
+ status = ocfs_update_lockres(osb, &bh, NULL, 0, inode,
+ 0, 0);
if (bh)
brelse(bh);
@@ -566,15 +567,15 @@
int ocfs_update_disk_lock (ocfs_super * osb, __u32 flags, struct buffer_head **bh, struct inode *inode, ocfs_journal_handle *handle)
{
int status = 0;
- __u64 offset = 0;
ocfs2_dinode *fe = NULL;
int changed = 0;
ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);
LOG_ENTRY ();
- offset = GET_INODE_FEOFF(inode);
- status = ocfs_read_bh (osb, offset, bh, 0, inode);
+ status = ocfs_read_bh(osb,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ bh, 0, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto finally;
@@ -680,7 +681,7 @@
lockres->master_node_num)) {
LOG_TRACE_ARGS ("Master (%u) dead, lockid %llu\n",
lockres->master_node_num,
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits);
status = 0;
goto bail;
}
@@ -710,7 +711,7 @@
ocfs_sleep (500);
if (ocfs_task_interruptible (osb)) {
LOG_TRACE_ARGS("interrupted... lockid=%llu\n",
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits);
status = -EINTR;
goto bail;
}
@@ -775,7 +776,7 @@
OCFS_ASSERT(lock_type != OCFS_DLM_NO_LOCK);
OCFS_ASSERT(inode);
- lock_id = GET_INODE_FEOFF(inode);
+ lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
LOG_TRACE_ARGS("lock_id = %llu\n", lock_id);
if (bh != NULL)
@@ -829,7 +830,7 @@
if (unlikely(lockres->master_node_num >= osb->max_nodes && !no_owner)) {
LOG_ERROR_ARGS("lockres: master_node=%d, owner=%s, lockid=%llu\n",
lockres->master_node_num, no_owner?"no":"yes",
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits);
LOG_ERROR_STATUS (status = -EINVAL);
ocfs_release_lockres (lockres); // ocfs_acquire_lock
goto finally;
@@ -925,7 +926,7 @@
#ifdef VERBOSE_LOCKING_TRACE
printk("lockres: lockid=%llu, this=%d, master=%d, locktype=%d, flags=%08x, ronode=%d\n",
- GET_INODE_FEOFF(inode), osb->node_num, lockres->master_node_num, lockres->lock_type,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits, osb->node_num, lockres->master_node_num, lockres->lock_type,
flags|extra_lock_flags, lockres->readonly_node);
#endif
if (wait_on_recovery && !((flags|extra_lock_flags) & FLAG_FILE_RECOVERY)) {
@@ -948,7 +949,7 @@
ocfs_sleep (500);
if (ocfs_task_interruptible (osb)) {
LOG_TRACE_ARGS("interrupted... lockid=%llu\n",
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits);
status = -EINTR;
goto finally;
}
@@ -1081,8 +1082,8 @@
}
}
- LOG_ERROR_ARGS("DISKVOTE!!: lock_type=%u, flags=%08x, offset=%llu, inode=%llu\n",
- lock_type, flags, lock_id, inode?GET_INODE_FEOFF(inode):0ULL);
+ LOG_ERROR_ARGS("DISKVOTE!!: lock_type=%u, flags=%08x, blkno=%llu, inode=%llu\n",
+ lock_type, flags, lock_id, inode?OCFS_I(inode)->ip_blkno:0ULL);
LOG_ERROR_ARGS("DISKVOTE!!: this=%d, master=%d, locktype=%d, ronode=%d\n",
osb->node_num, lockres->master_node_num, lockres->lock_type,
lockres->readonly_node);
@@ -1163,7 +1164,7 @@
OCFS_ASSERT(inode);
- lock_id = GET_INODE_FEOFF(inode);
+ lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
LOG_TRACE_ARGS("lock_id = %llu", lock_id);
flags |= FLAG_RELEASE_LOCK;
@@ -1252,7 +1253,7 @@
LOG_ENTRY ();
- lock_id = GET_INODE_FEOFF(inode);
+ lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
if (flags & FLAG_READDIR) {
if (flags & (FLAG_CHANGE_MASTER | FLAG_REMASTER)) {
@@ -1338,8 +1339,8 @@
}
- LOG_ERROR_ARGS("DISKVOTE!!: req_lock=%u, flags=%08x, offset=%llu, inode=%llu\n",
- requested_lock, flags, lock_id, inode?GET_INODE_FEOFF(inode):0ULL);
+ LOG_ERROR_ARGS("DISKVOTE!!: req_lock=%u, flags=%08x, blkno=%llu, inode=%llu\n",
+ requested_lock, flags, lock_id, inode?OCFS_I(inode)->ip_blkno:0ULL);
LOG_ERROR_ARGS("DISKVOTE!!: this=%d, master=%d, locktype=%d, ronode=%d\n",
osb->node_num, lockres->master_node_num, lockres->lock_type,
lockres->readonly_node);
@@ -1412,7 +1413,7 @@
if (status == -EAGAIN) {
if (ocfs_task_interruptible (osb)) {
LOG_TRACE_ARGS("interrupted.... lockid=%llu\n",
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits);
status = -EINTR;
}
}
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/file.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -143,10 +143,12 @@
/* this will update the lock info from disk while also
* ensuring that the lock level drops to something
* compatible with a first-open of the file */
- status = ocfs_wait_for_lock_release (osb, GET_INODE_FEOFF(inode),
- 30000, (S_ISDIR (inode->i_mode) ?
- OCFS_DLM_EXCLUSIVE_LOCK :
- OCFS_DLM_NO_LOCK), inode);
+ status = ocfs_wait_for_lock_release(osb,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ 30000,
+ (S_ISDIR (inode->i_mode) ?
+ OCFS_DLM_EXCLUSIVE_LOCK :
+ OCFS_DLM_NO_LOCK), inode);
if (status < 0) {
if (status != -EINTR) {
LOG_ERROR_STR ("Lock owner is alive and taking too much time");
@@ -214,8 +216,9 @@
/* first open, we've gotta update the lock state. */
if (!OCFS_I(inode)->ip_open_cnt) {
- status = ocfs_read_bh(osb, GET_INODE_FEOFF(inode), &fe_bh,
- OCFS_BH_CACHED, inode);
+ status = ocfs_read_bh(osb,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ &fe_bh, OCFS_BH_CACHED, inode);
if (status < 0) {
up_write(&OCFS_I(inode)->ip_io_sem);
LOG_ERROR_STATUS(status);
@@ -384,7 +387,7 @@
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)->ip_blkno,
OCFS_I(inode)->ip_num_extends);
OCFS_I(inode)->ip_num_extends = 0;
list_del(&OCFS_I(inode)->ip_recovery_list);
@@ -799,8 +802,9 @@
("Will need more allocation: have=%llu, need=%llu\n",
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);
+ status = ocfs_extend_file(osb, newsize,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ NULL, inode, NULL, 0, NULL);
up_write(&OCFS_I(inode)->ip_io_sem);
if (status < 0) {
if (status != -EINTR && status != -ENOSPC) {
@@ -1449,7 +1453,7 @@
goto bail;
/* get the file and parent offsets, and the file oin if present */
- fileOff = GET_INODE_FEOFF(inode);
+ fileOff = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
if (attr->ia_valid & ATTR_SIZE) {
if (atomic_read(&OCFS_I(inode)->ip_needs_verification)) {
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/inode.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -166,7 +166,7 @@
bail:
if (inode) {
LOG_TRACE_ARGS("returning inode with number %llu\n",
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
/* inode was *not* in the inode cache. 2.6.x requires
* us to do our own read_inode call and unlock it
@@ -199,14 +199,14 @@
ocfs_find_inode_args *args = NULL;
int ret = 0;
- LOG_ENTRY_ARGS ("(0x%p, %lu, %llu, 0x%p)\n", inode, inode->i_ino, GET_INODE_FEOFF(inode), opaque);
+ LOG_ENTRY_ARGS ("(0x%p, %lu, %llu, 0x%p)\n", inode, inode->i_ino, OCFS_I(inode)->ip_blkno, opaque);
if (inode == NULL)
goto bail;
args = opaque;
- if (GET_INODE_FEOFF(inode) != args->feoff) {
+ if ((OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits) != args->feoff) {
LOG_ERROR_STATUS(-EINVAL);
goto bail;
}
@@ -261,7 +261,7 @@
args = opaque;
- if (GET_INODE_FEOFF(inode) != args->feoff) {
+ if ((OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits) != args->feoff) {
LOG_ERROR_STATUS(-EINVAL);
goto bail;
}
@@ -325,7 +325,7 @@
/* These should be set in read_inode2. */
i->ip_alloc_size = 0ULL;
- i->ip_feoff = 0ULL;
+ i->ip_blkno = 0ULL;
OCFS_SET_FLAG (i->ip_flags, OCFS_INODE_INITIALIZED);
return 0;
@@ -377,8 +377,7 @@
OCFS_SET_INODE_TIME(inode, i_mtime, fe->i_mtime);
OCFS_SET_INODE_TIME(inode, i_ctime, fe->i_ctime);
- SET_INODE_FEOFF(inode,
- fe->i_blkno << osb->sb->s_blocksize_bits);
+ OCFS_I(inode)->ip_blkno = fe->i_blkno;
OCFS_I(inode)->ip_alloc_size =
(u64)fe->i_clusters << osb->s_clustersize_bits;
@@ -518,7 +517,7 @@
LOG_SET_CONTEXT(PUT_INODE);
- LOG_ENTRY_ARGS ("(0x%p, i_ino=%llu)\n", inode, GET_INODE_FEOFF(inode));
+ LOG_ENTRY_ARGS ("(0x%p, i_ino=%llu)\n", inode, OCFS_I(inode)->ip_blkno);
LOG_TRACE_ARGS ("put_inode: count=%d\n", atomic_read(&inode->i_count));
osb = OCFS_SB(inode->i_sb);
LOG_EXIT ();
@@ -718,7 +717,6 @@
*/
void ocfs_clear_inode (struct inode *inode)
{
- __u64 offset = 0;
ocfs_super *osb;
LOG_SET_CONTEXT(CLEAR_INODE);
@@ -728,8 +726,8 @@
if (!inode)
goto bail;
- LOG_TRACE_ARGS("Clearing inode feoff: %llu, nlink = %u)\n",
- GET_INODE_FEOFF(inode), inode->i_nlink);
+ LOG_TRACE_ARGS("Clearing inode: %llu, nlink = %u)\n",
+ OCFS_I(inode)->ip_blkno, inode->i_nlink);
/* we should not really be using osb in this context. */
osb = OCFS_SB(inode->i_sb);
@@ -741,14 +739,13 @@
OCFS_CLEAR_FLAG (OCFS_I(inode)->ip_flags, OCFS_INODE_INITIALIZED);
- offset = GET_INODE_FEOFF(inode);
- if (offset == -1)
+ if (OCFS_I(inode)->ip_blkno == -1)
BUG();
- /* offset == 0 if this inode is newly created and hasn't been
+ /* blkno == 0 if this inode is newly created and hasn't been
* filled in yet. */
- if (offset == 0) {
- LOG_ERROR_STR("uhm, feoff = 0!");
+ if (OCFS_I(inode)->ip_blkno == 0) {
+ LOG_ERROR_STR("uhm, blkno = 0!");
goto bail;
}
@@ -870,7 +867,6 @@
int err = -EIO;
int status;
ocfs2_dinode *fe = NULL;
- __u64 entryOffset;
struct buffer_head *bh = NULL;
LOG_ENTRY_ARGS ("(0x%p, %llu, 0x%p, %d)\n", inode,
@@ -887,9 +883,9 @@
goto bail;
}
- entryOffset = GET_INODE_FEOFF(inode);
-
- status = ocfs_read_bh(OCFS_SB(inode->i_sb), entryOffset, &bh,
+ status = ocfs_read_bh(OCFS_SB(inode->i_sb),
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ &bh,
OCFS_BH_CACHED, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
@@ -898,7 +894,8 @@
fe = (ocfs2_dinode *) bh->b_data;
if (!IS_VALID_FILE_ENTRY(fe)) {
- LOG_ERROR_ARGS ("Invalid fe at offset %llu", entryOffset);
+ LOG_ERROR_ARGS("Invalid fe at blkno %llu",
+ OCFS_I(inode)->ip_blkno);
goto bail;
}
@@ -961,7 +958,7 @@
*err = ocfs_extend_file(osb,
vbo + vbo_pad,
- GET_INODE_FEOFF(inode),
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
handle, inode, NULL, 0, NULL);
if (*err < 0) {
*err = -ENOSPC;
@@ -1070,7 +1067,7 @@
inode->i_ino);
down_write(&OCFS_I(inode)->ip_io_sem);
err = ocfs_extend_file(osb, vbo + vbo_pad,
- GET_INODE_FEOFF(inode),
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
NULL, inode, NULL, 0, NULL);
up_write(&OCFS_I(inode)->ip_io_sem);
if (err < 0) {
@@ -1098,9 +1095,9 @@
if (bh_result->b_blocknr == 0) {
err = -EIO;
- LOG_ERROR_ARGS ("vbo=%lld lbo=%lld len=%u, feoff=(%llu)\n",
+ LOG_ERROR_ARGS ("vbo=%lld lbo=%lld len=%u, blkno=(%llu)\n",
vbo, lbo, len,
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno);
}
bail:
@@ -1201,9 +1198,9 @@
*oblock = lbo >> inode->i_sb->s_blocksize_bits;
if (*oblock == 0) {
err = -EIO;
- LOG_ERROR_ARGS ("vbo=%lld lbo=%lld len=%u, feoff=(%llu)\n",
+ LOG_ERROR_ARGS ("vbo=%lld lbo=%lld len=%u, blkno=(%llu)\n",
vbo, lbo, len,
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno);
}
bail:
@@ -1336,7 +1333,8 @@
blocks for the file. */
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),
+ status = ocfs_extend_file(osb, vbo_max,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
NULL, inode, NULL, 0, NULL);
if (status < 0) {
status = -ENOSPC;
@@ -1842,7 +1840,7 @@
LOG_SET_CONTEXT(REVALIDATE);
LOG_ENTRY_ARGS("(inode = 0x%p, ino = %llu)\n", inode,
- inode ? GET_INODE_FEOFF(inode) : 0ULL);
+ inode ? OCFS_I(inode)->ip_blkno : 0ULL);
if (!inode) {
LOG_TRACE_STR("eep, no inode!\n");
@@ -1905,7 +1903,6 @@
struct buffer_head *fe_bh = NULL;
ocfs2_dinode *fe;
ocfs2_extent_list *fel;
- __u64 offset;
int drop_ip_sem = 0;
/* We are setting the oin Updated flag in the end. */
@@ -1918,9 +1915,8 @@
/* This read of feoff from the inode depends on all callers to
* make sure that unlink or rename can't be change it while we're
* in here! */
- offset = GET_INODE_FEOFF(inode);
- if (offset == 0) {
- LOG_ERROR_ARGS("inode %llu has zero offset\n", GET_INODE_FEOFF(inode));
+ if (OCFS_I(inode)->ip_blkno == 0) {
+ LOG_ERROR_ARGS("inode 0x%lu has zero blkno\n", inode->i_ino);
status = -EINVAL;
goto leave;
}
@@ -1929,13 +1925,15 @@
if (INODE_DELETED(inode)) {
up(&OCFS_I(inode)->ip_sem);
LOG_TRACE_ARGS("Inode %llu was marked as deleted!",
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno);
status = -ENOENT;
goto leave;
}
up(&OCFS_I(inode)->ip_sem);
- status = ocfs_read_bh(osb, offset, &fe_bh, OCFS_BH_COND_CACHED, inode);
+ status = ocfs_read_bh(osb,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ &fe_bh, OCFS_BH_COND_CACHED, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto leave;
@@ -1992,7 +1990,8 @@
(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)->ip_blkno);
inode->i_nlink = fe->i_links_count;
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;
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/journal.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -318,7 +318,7 @@
if (tmpstat < 0) {
LOG_ERROR_ARGS("Could not release lock: "
"%llu\n",
- GET_INODE_FEOFF(lock->inode));
+ OCFS_I(lock->inode)->ip_blkno << lock->inode->i_sb->s_blocksize_bits);
LOG_ERROR_STATUS(tmpstat);
status = tmpstat;
}
@@ -898,7 +898,7 @@
status = -EACCES;
goto done;
}
- lock_id = GET_INODE_FEOFF(inode);
+ lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
down_write(&OCFS_I(inode)->ip_io_sem);
@@ -1343,7 +1343,7 @@
status = -EACCES;
goto done;
}
- lock_id = GET_INODE_FEOFF(inode);
+ lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
down_write(&OCFS_I(inode)->ip_io_sem);
Modified: trunk/src/lockres.c
===================================================================
--- trunk/src/lockres.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/lockres.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -60,7 +60,9 @@
*
* Returns 0 if success, < 0 if error.
*/
-int ocfs_update_lockres (ocfs_super * osb, struct buffer_head **bh, __u32 * updated, __u32 timeout, struct inode *inode, int reread, int locked)
+int ocfs_update_lockres(ocfs_super *osb, struct buffer_head **bh,
+ __u32 *updated, __u32 timeout,
+ struct inode *inode, int reread, int locked)
{
int status = 0;
struct buffer_head *tmpbh = NULL, **b = NULL;
@@ -68,8 +70,9 @@
int flags;
ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);;
- LOG_ENTRY_ARGS ("(0x%p, %llu, 0x%p, 0x%p, 0x%p)\n", osb,
- GET_INODE_FEOFF(inode), lockres, bh, updated);
+ LOG_ENTRY_ARGS("(0x%p, %llu, 0x%p, 0x%p, 0x%p)\n", osb,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ lockres, bh, updated);
b = (bh == NULL) ? &tmpbh : bh;
@@ -77,7 +80,9 @@
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, GET_INODE_FEOFF(inode), b, flags, inode);
+ status = ocfs_read_bh(osb,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ b, flags, inode);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto finally;
@@ -89,7 +94,7 @@
status = ocfs_acquire_lockres (lockres, timeout); // 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
if (status < 0) {
LOG_TRACE_ARGS ("Timedout locking lockres for id: %llu\n",
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits);
goto finally;
}
@@ -105,7 +110,7 @@
lockres->readonly_node != lockres->master_node_num) {
LOG_ERROR_ARGS("no longer readonly! ronode=%d, master=%d, lockid=%llu\n",
lockres->readonly_node, lockres->master_node_num,
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits);
lockres->readonly_node = OCFS_INVALID_NODE_NUM;
}
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/namei.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -280,7 +280,7 @@
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(GET_INODE_FEOFF(dir) >> dir->i_sb->s_blocksize_bits);
+ de->inode = cpu_to_le64(OCFS_I(dir)->ip_blkno);
de->rec_len = cpu_to_le16(inode->i_sb->s_blocksize -
OCFS2_DIR_REC_LEN(1));
de->name_len = 2;
@@ -535,7 +535,6 @@
int cleanup_parent = 0;
int cleanup_fe = 0;
ocfs_super *osb = OCFS_SB(dir->i_sb);
- u64 fe_blkno;
LOG_SET_CONTEXT(LINK);
@@ -612,8 +611,8 @@
goto bail;
}
- fe_blkno = GET_INODE_FEOFF(inode) >> osb->sb->s_blocksize_bits;
- err = ocfs_add_entry(handle, dentry, inode, fe_blkno, parent_fe_bh);
+ err = ocfs_add_entry(handle, dentry, inode,
+ OCFS_I(inode)->ip_blkno, parent_fe_bh);
if (err) {
inode->i_nlink--;
LOG_ERROR_STATUS(err);
@@ -665,21 +664,20 @@
* ocfs_unlink()
*
*/
-static int ocfs_unlink (struct inode *dir, struct dentry *dentry)
+static int ocfs_unlink(struct inode *dir, struct dentry *dentry)
{
int status, tmpstat;
int got_parent = 0, got_file = 0;
struct inode *inode = dentry->d_inode;
int retval = -EBUSY;
ocfs_super *osb = OCFS_SB(dir->i_sb);
- __u64 fe_off = GET_INODE_FEOFF(inode);
+ __u64 fe_off;
struct inode *parentInode = dentry->d_parent->d_inode;
ocfs2_dinode *fe = NULL;
__u32 lockFlags = (S_ISDIR (inode->i_mode) ? (FLAG_RELEASE_DENTRY | FLAG_DIR) : FLAG_RELEASE_DENTRY);
struct buffer_head *fe_bh = NULL;
struct buffer_head *parent_node_bh = NULL; /* parent locknode */
ocfs_journal_handle *handle = NULL;
- __u64 parent_off = GET_INODE_FEOFF(parentInode);
struct ocfs2_dir_entry *dirent = NULL;
struct buffer_head *dirent_bh = NULL;
@@ -688,7 +686,7 @@
LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", dir, dentry,
dentry->d_name.len, dentry->d_name.name);
- LOG_TRACE_ARGS("ino = %llu\n", fe_off);
+ LOG_TRACE_ARGS("ino = %llu\n", OCFS_I(inode)->ip_blkno);
status = -EBUSY;
@@ -735,7 +733,8 @@
goto leave;
}
- if (fe_off != GET_INODE_FEOFF(inode))
+ if ((fe_off >> inode->i_sb->s_blocksize_bits) !=
+ OCFS_I(inode)->ip_blkno)
BUG();
status = ocfs_read_bh(osb, fe_off, &fe_bh, OCFS_BH_CACHED, inode);
@@ -769,8 +768,10 @@
goto leave;
}
- status = ocfs_read_bh(osb, parent_off, &parent_node_bh,
- OCFS_BH_CACHED, parentInode);
+ status = ocfs_read_bh(osb,
+ OCFS_I(parentInode)->ip_blkno << parentInode->i_sb->s_blocksize_bits,
+ &parent_node_bh, OCFS_BH_CACHED,
+ parentInode);
if (status < 0) {
LOG_ERROR_STATUS (status);
goto leave;
@@ -890,13 +891,14 @@
* The only place this should be used is rename!
* if they have the same id, then the 1st one is the only one locked.
*/
-static int ocfs_double_lock(ocfs_super *osb, ocfs_journal_handle *handle,
- __u32 type1, __u32 flags1,
- struct buffer_head **bh1,
- struct inode *inode1,
- __u32 type2, __u32 flags2,
- struct buffer_head **bh2,
- struct inode *inode2)
+static int ocfs_double_lock(ocfs_super *osb,
+ ocfs_journal_handle *handle,
+ __u32 type1, __u32 flags1,
+ struct buffer_head **bh1,
+ struct inode *inode1,
+ __u32 type2, __u32 flags2,
+ struct buffer_head **bh2,
+ struct inode *inode2)
{
int status = 0;
int id2_locked = 0;
@@ -905,11 +907,12 @@
struct buffer_head **tmpbh;
struct inode *tmpinode;
- LOG_ENTRY_ARGS("(lock_id1 = %llu, lock_id2 = %llu)\n",
- GET_INODE_FEOFF(inode1), GET_INODE_FEOFF(inode2));
+ LOG_ENTRY_ARGS("(inode1 = %llu, inode2 = %llu)\n",
+ OCFS_I(inode1)->ip_blkno,
+ OCFS_I(inode2)->ip_blkno);
- id1 = GET_INODE_FEOFF(inode1);
- id2 = GET_INODE_FEOFF(inode2);
+ id1 = OCFS_I(inode1)->ip_blkno << inode1->i_sb->s_blocksize_bits;
+ id2 = OCFS_I(inode2)->ip_blkno << inode2->i_sb->s_blocksize_bits;
if (*bh1)
*bh1 = NULL;
@@ -1041,7 +1044,7 @@
osb = OCFS_SB(old_dir->i_sb);
- oldfe_lockid = GET_INODE_FEOFF(old_inode);
+ oldfe_lockid = OCFS_I(old_inode)->ip_blkno << old_inode->i_sb->s_blocksize_bits;
double_down_write(&OCFS_I(old_dir)->ip_io_sem,
&OCFS_I(new_dir)->ip_io_sem);
@@ -1120,7 +1123,7 @@
status = -EIO;
if (le64_to_cpu(PARENT_INO(old_inode_de_bh->b_data)) !=
- (GET_INODE_FEOFF(old_dir) >> old_dir->i_sb->s_blocksize_bits))
+ OCFS_I(old_dir)->ip_blkno)
goto finally;
status = -EMLINK;
if (!new_inode && new_dir!=old_dir &&
@@ -1141,8 +1144,7 @@
* and merrily kill the link to whatever was created under the
* same name. Goodbye sticky bit ;-<
*/
- if (le64_to_cpu(old_de->inode) !=
- (GET_INODE_FEOFF(old_inode) >> new_dir->i_sb->s_blocksize_bits))
+ if (le64_to_cpu(old_de->inode) != OCFS_I(old_inode)->ip_blkno)
goto finally;
/* check if the target already exists (in which case we need
@@ -1170,7 +1172,8 @@
if (!new_inode)
BUG();
- if (newfe_lockid != GET_INODE_FEOFF(new_inode))
+ if (newfe_lockid !=
+ (OCFS_I(new_inode)->ip_blkno << new_inode->i_sb->s_blocksize_bits))
BUG();
if (S_ISDIR(new_inode->i_mode))
@@ -1241,7 +1244,8 @@
LOG_ERROR_STATUS (status);
goto finally;
}
- new_de->inode = le64_to_cpu(GET_INODE_FEOFF(old_inode) >> new_dir->i_sb->s_blocksize_bits);
+ new_de->inode =
+ le64_to_cpu(OCFS_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);
@@ -1285,7 +1289,8 @@
// BAD
goto bail;
}
- PARENT_INO(old_inode_de_bh->b_data) = le64_to_cpu(GET_INODE_FEOFF(new_dir));
+ PARENT_INO(old_inode_de_bh->b_data) =
+ le64_to_cpu(OCFS_I(new_dir)->ip_blkno);
status = ocfs_journal_dirty(handle, old_inode_de_bh);
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -1307,11 +1312,11 @@
if (old_dir != new_dir) {
if (new_dir_nlink != new_dir->i_nlink)
LOG_ERROR_ARGS("need to change nlink for new dir %llu from %d to %d\n",
- GET_INODE_FEOFF(new_dir), (int)new_dir_nlink, new_dir->i_nlink);
+ OCFS_I(new_dir)->ip_blkno, (int)new_dir_nlink, new_dir->i_nlink);
}
if (old_dir_nlink != old_dir->i_nlink)
LOG_ERROR_ARGS("need to change nlink for old dir %llu from %d to %d\n",
- GET_INODE_FEOFF(old_dir), (int)old_dir_nlink, old_dir->i_nlink);
+ OCFS_I(old_dir)->ip_blkno, (int)old_dir_nlink, old_dir->i_nlink);
/* commit_trans */
ocfs_commit_trans(handle);
@@ -1525,7 +1530,7 @@
if (error_msg != NULL)
LOG_ERROR_ARGS("bad entry in directory #%llu: %s - "
"offset=%lu, inode=%llu, rec_len=%d, name_len=%d",
- GET_INODE_FEOFF(dir), error_msg, offset,
+ OCFS_I(dir)->ip_blkno, error_msg, offset,
le64_to_cpu(de->inode),
rlen, de->name_len);
return error_msg == NULL ? 1 : 0;
@@ -1868,7 +1873,7 @@
}
namelen = snprintf(name, OCFS2_MAX_FILENAME_LENGTH+1, "%llu",
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno);
if (namelen <= 0) {
if (namelen)
status = namelen;
@@ -1902,7 +1907,7 @@
orphan_dir_inode, 1);
status = __ocfs_add_entry(handle, orphan_dir_inode, name, namelen,
- inode, GET_INODE_FEOFF(inode) >> inode->i_sb->s_blocksize_bits,
+ inode, OCFS_I(inode)->ip_blkno,
orphan_dir_bh);
if (status < 0) {
LOG_ERROR_STATUS(status);
@@ -1968,7 +1973,7 @@
}
namelen = snprintf(name, OCFS2_MAX_FILENAME_LENGTH+1, "%llu",
- GET_INODE_FEOFF(inode));
+ OCFS_I(inode)->ip_blkno);
if (namelen <= 0) {
if (namelen)
status = namelen;
Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/nm.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -465,7 +465,7 @@
lockid, node_num, flags);
if (inode)
- lockid = GET_INODE_FEOFF(inode);
+ lockid = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
*master_alive = 1;
@@ -790,8 +790,8 @@
status = ocfs_acquire_lockres (lockres, (OCFS_NM_HEARTBEAT_TIME/2)); // ocfs_process_vote
if (status < 0) {
- LOG_TRACE_ARGS ("Timedout locking lockres for id: %llu\n",
- GET_INODE_FEOFF(inode));
+ LOG_TRACE_ARGS("Timedout locking lockres for id: %llu\n",
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits);
goto leave;
}
}
@@ -1001,8 +1001,9 @@
/* requestor will need to retry if anyone is using the lockres */
if (lockres->lock_holders > 0) {
- LOG_TRACE_ARGS("Lock id (%llu) has %u holders\n",
- GET_INODE_FEOFF(inode), lockres->lock_holders);
+ LOG_TRACE_ARGS("Lock id (%llu) has %u holders\n",
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ lockres->lock_holders);
down(&(osb->journal->commit_sem));
if (ocfs_search_commited(osb, inode)) {
// kick the commit thread
Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/ocfs.h 2004-06-22 23:18:56 UTC (rev 1191)
@@ -406,7 +406,7 @@
* read. */
struct inode *ip_inode;
- __u64 ip_feoff;
+ u64 ip_blkno;
/* These fields are protected by ip_sem */
struct semaphore ip_sem;
@@ -482,14 +482,7 @@
#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)->ip_feoff = o; \
-} while (0)
-#define GET_INODE_FEOFF(i) OCFS_I(i)->ip_feoff
-
-
#define GET_INODE_LOCKRES(i) ({ if (i==NULL) BUG(); (&(OCFS_I(i)->ip_lockres)); })
typedef enum _ocfs_vol_state
@@ -1059,8 +1052,8 @@
atomic_read(&inode->i_count), inode->i_state,
inode->i_ino);
- LOG_ERROR_ARGS("feoff=%llu, deleted=%u\n",
- GET_INODE_FEOFF(inode),
+ LOG_ERROR_ARGS("inode=%llu, deleted=%u\n",
+ OCFS_I(inode)->ip_blkno,
INODE_DELETED(inode));
return -EINVAL;
Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/super.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -706,15 +706,18 @@
osb = OCFS_SB(sb);
- inode = ocfs_get_system_file_inode(osb, GLOBAL_BITMAP_SYSTEM_INODE, -1);
+ inode = ocfs_get_system_file_inode(osb,
+ GLOBAL_BITMAP_SYSTEM_INODE,
+ -1);
if (!inode) {
LOG_ERROR_STR("failed to get bitmap inode");
ret = -EIO;
goto bail;
}
- status = ocfs_read_bh (osb, GET_INODE_FEOFF(inode), &bh,
- OCFS_BH_CACHED, inode);
+ status = ocfs_read_bh(osb,
+ OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
+ &bh, OCFS_BH_CACHED, inode);
if (status < 0) {
LOG_ERROR_STR("failed to read bitmap data");
ret = -EIO;
Modified: trunk/src/util.c
===================================================================
--- trunk/src/util.c 2004-06-22 23:03:04 UTC (rev 1190)
+++ trunk/src/util.c 2004-06-22 23:18:56 UTC (rev 1191)
@@ -222,8 +222,8 @@
void ocfs_truncate_inode_pages(struct inode *inode, loff_t off)
{
- LOG_TRACE_ARGS ("truncating pages for inode %llu (%p) from offset %llu\n",
- GET_INODE_FEOFF(inode), inode, off);
+ LOG_TRACE_ARGS("truncating pages for inode %llu (%p) from offset %llu\n",
+ OCFS_I(inode)->ip_blkno, inode, off);
truncate_inode_pages(&inode->i_data, off);
} /* ocfs_truncate_inode_pages */
More information about the Ocfs2-commits
mailing list