[Ocfs2-commits] jlbec commits r2286 - branches/alloc_inode/fs/ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu May 19 14:01:32 CDT 2005
Author: jlbec
Date: 2005-05-19 14:01:30 -0500 (Thu, 19 May 2005)
New Revision: 2286
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/mmap.h
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/vote.c
Log:
o Move ip_lock to ocfs2_inode_info.
Modified: branches/alloc_inode/fs/ocfs2/alloc.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/alloc.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/alloc.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -1418,9 +1418,9 @@
}
el = &(fe->id2.i_list);
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
OCFS2_I(inode)->ip_clusters = fe->i_clusters - clusters_to_del;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
fe->i_clusters -= clusters_to_del;
fe->i_mtime = CURRENT_TIME.tv_sec;
Modified: branches/alloc_inode/fs/ocfs2/aops.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/aops.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/aops.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -152,15 +152,15 @@
vbo = (u64)iblock << inode->i_sb->s_blocksize_bits;
/* this can happen if another node truncs after our extend! */
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
if (iblock >=
ocfs2_clusters_to_blocks(inode->i_sb,
OCFS2_I(inode)->ip_clusters)) {
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
err = -EIO;
goto bail;
}
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
err = ocfs2_extent_map_get_blocks(inode, iblock, 1, &p_blkno,
NULL);
@@ -359,15 +359,15 @@
vbo_max = ((u64)iblock + max_blocks) << blocksize_bits;
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
if ((iblock + max_blocks) >
ocfs2_clusters_to_blocks(inode->i_sb,
OCFS2_I(inode)->ip_clusters)) {
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
ret = -EIO;
goto bail;
}
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
/* This figures out the size of the next contiguous block, and
* our logical offset */
Modified: branches/alloc_inode/fs/ocfs2/dcache.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/dcache.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/dcache.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -59,15 +59,15 @@
goto bail;
}
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
/* did we or someone else delete this inode? */
if (INODE_DELETED(inode)) {
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
mlog(0, "inode (%"MLFu64") deleted, returning false\n",
OCFS2_I(inode)->ip_blkno);
goto bail;
}
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
#warning "should we do this for all files?"
if (S_ISDIR(inode->i_mode) && (!inode->i_nlink)) {
Modified: branches/alloc_inode/fs/ocfs2/dir.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/dir.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/dir.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -335,9 +335,9 @@
int extend;
u64 p_blkno;
- spin_lock(&OCFS_I(dir)->ip_lock);
+ spin_lock(&OCFS2_I(dir)->ip_lock);
extend = (i_size_read(dir) == ocfs2_clusters_to_bytes(sb, OCFS2_I(dir)->ip_clusters));
- spin_unlock(&OCFS_I(dir)->ip_lock);
+ spin_unlock(&OCFS2_I(dir)->ip_lock);
if (extend) {
status = ocfs_extend_allocation(OCFS2_SB(sb), dir, 1,
@@ -401,9 +401,9 @@
}
/* dir->i_size is always block aligned. */
- spin_lock(&OCFS_I(dir)->ip_lock);
+ spin_lock(&OCFS2_I(dir)->ip_lock);
if (dir_i_size == ocfs2_clusters_to_bytes(sb, OCFS2_I(dir)->ip_clusters)) {
- spin_unlock(&OCFS_I(dir)->ip_lock);
+ spin_unlock(&OCFS2_I(dir)->ip_lock);
num_free_extents = ocfs_num_free_extents(osb, dir, fe);
if (num_free_extents < 0) {
status = num_free_extents;
@@ -430,7 +430,7 @@
credits = ocfs_calc_extend_credits(sb, fe, 1);
} else {
- spin_unlock(&OCFS_I(dir)->ip_lock);
+ spin_unlock(&OCFS2_I(dir)->ip_lock);
credits = OCFS_SIMPLE_DIR_EXTEND_CREDITS;
}
Modified: branches/alloc_inode/fs/ocfs2/dlmglue.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/dlmglue.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/dlmglue.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -1236,7 +1236,7 @@
be64_to_cpu(lvb->lvb_ictime), be64_to_cpu(lvb->lvb_imtime));
/* We're safe here without the lockres lock... */
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
OCFS2_I(inode)->ip_clusters = be32_to_cpu(lvb->lvb_iclusters);
inode->i_uid = be32_to_cpu(lvb->lvb_iuid);
inode->i_gid = be32_to_cpu(lvb->lvb_igid);
@@ -1251,7 +1251,7 @@
inode->i_atime.tv_sec = be64_to_cpu(lvb->lvb_iatime);
inode->i_ctime.tv_sec = be64_to_cpu(lvb->lvb_ictime);
inode->i_mtime.tv_sec = be64_to_cpu(lvb->lvb_imtime);
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
mlog_exit_void();
}
@@ -1264,9 +1264,9 @@
mlog_entry_void();
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
i_clusters = OCFS2_I(inode)->ip_clusters;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
spin_lock(&lockres->l_lock);
if (lockres->l_level == LKM_EXMODE)
@@ -1367,14 +1367,14 @@
mlog_entry_void();
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
if (INODE_DELETED(inode))
mlog(ML_ERROR,
"Orphaned inode %"MLFu64"was deleted while we "
"were waiting on a lock. ip_flags = 0x%x\n",
OCFS2_I(inode)->ip_blkno,
OCFS2_I(inode)->ip_flags);
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
lockres = &OCFS2_I(inode)->ip_meta_lockres;
Modified: branches/alloc_inode/fs/ocfs2/extent_map.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/extent_map.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/extent_map.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -269,16 +269,16 @@
ocfs2_dinode *di;
ocfs2_extent_list *el;
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
ent = ocfs2_extent_map_lookup(em, cpos, clusters, NULL, NULL);
if (ent) {
if (!ent->e_tree_depth) {
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
*ret_ent = ent;
return 0;
}
blkno = ent->e_rec.e_blkno;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
ret = ocfs_read_block(OCFS2_SB(inode->i_sb), blkno, &bh,
OCFS_BH_CACHED, inode);
@@ -291,7 +291,7 @@
OCFS2_BUG_ON_INVALID_EXTENT_BLOCK(eb);
el = &eb->h_list;
} else {
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
ret = ocfs_read_block(OCFS2_SB(inode->i_sb),
OCFS2_I(inode)->ip_blkno, &bh,
@@ -363,7 +363,7 @@
ctxt->need_right = 0;
ctxt->old_ent = NULL;
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
ret = ocfs2_extent_map_insert_entry(em, ctxt->new_ent);
if (!ret) {
ctxt->new_ent = NULL;
@@ -449,7 +449,7 @@
ctxt->new_ent = NULL;
out_unlock:
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
return ret;
}
@@ -559,8 +559,16 @@
em->em_clusters = OCFS2_I(inode)->ip_clusters;
}
- OCFS_ASSERT((rec->e_cpos + rec->e_clusters) ==
- (em->em_clusters + new_clusters));
+ mlog_bug_on_msg((rec->e_cpos + rec->e_clusters) !=
+ (em->em_clusters + new_clusters),
+ "Inode %"MLFu64":\n"
+ "rec->e_cpos = %u + rec->e_clusters = %u = %u\n"
+ "em->em_clusters = %u + new_clusters = %u = %u\n",
+ OCFS2_I(inode)->ip_blkno,
+ rec->e_cpos, rec->e_clusters,
+ rec->e_cpos + rec->e_clusters,
+ em->em_clusters, new_clusters,
+ em->em_clusters + new_clusters);
em->em_clusters += new_clusters;
@@ -840,7 +848,7 @@
struct ocfs2_extent_map *em = &OCFS2_I(inode)->ip_map;
struct ocfs2_extent_map_entry *ent;
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
__ocfs2_extent_map_drop(inode, new_clusters, &free_head, &ent);
@@ -850,7 +858,7 @@
free_head = &ent->e_node;
}
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
if (free_head)
__ocfs2_extent_map_drop_cleanup(free_head);
@@ -868,7 +876,7 @@
struct rb_node *free_head = NULL;
struct ocfs2_extent_map_entry *ent = NULL;
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
__ocfs2_extent_map_drop(inode, new_clusters, &free_head, &ent);
@@ -878,7 +886,7 @@
OCFS2_I(inode)->ip_map.em_clusters = new_clusters;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
if (free_head)
__ocfs2_extent_map_drop_cleanup(free_head);
Modified: branches/alloc_inode/fs/ocfs2/file.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/file.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/file.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -89,7 +89,6 @@
int status;
int mode = file->f_flags;
struct ocfs2_inode_info *oi = OCFS2_I(inode);
- ocfs_inode_private *oip = OCFS_I(inode);
mlog_entry ("(0x%p, 0x%p, '%.*s')\n", inode, file,
file->f_dentry->d_name.len,
@@ -97,11 +96,11 @@
status = -EACCES;
- spin_lock(&oip->ip_lock);
+ spin_lock(&oi->ip_lock);
if (oi->ip_open_count &&
!ocfs2_valid_open(mode,
oi->ip_flags & OCFS2_INODE_OPEN_DIRECT)) {
- spin_unlock(&oip->ip_lock);
+ spin_unlock(&oi->ip_lock);
goto leave;
}
@@ -109,7 +108,7 @@
oi->ip_flags |= OCFS2_INODE_OPEN_DIRECT;
oi->ip_open_count++;
- spin_unlock(&oip->ip_lock);
+ spin_unlock(&oi->ip_lock);
status = 0;
leave:
mlog_exit(status);
@@ -119,16 +118,15 @@
static int ocfs_file_release(struct inode *inode, struct file *file)
{
struct ocfs2_inode_info *oi = OCFS2_I(inode);
- ocfs_inode_private *oip = OCFS_I(inode);
mlog_entry("(0x%p, 0x%p, '%.*s')\n", inode, file,
file->f_dentry->d_name.len,
file->f_dentry->d_name.name);
- spin_lock(&oip->ip_lock);
+ spin_lock(&oi->ip_lock);
if (!--oi->ip_open_count)
oi->ip_flags &= ~OCFS2_INODE_OPEN_DIRECT;
- spin_unlock(&oip->ip_lock);
+ spin_unlock(&oi->ip_lock);
mlog_exit(0);
@@ -388,10 +386,10 @@
}
/* FIXME: I think this should all be in the caller */
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
if (!grow)
OCFS2_I(inode)->ip_mmu_private = i_size_read(inode);
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
bail:
mlog_exit(status);
@@ -663,9 +661,9 @@
}
fe->i_clusters += num_bits;
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
OCFS2_I(inode)->ip_clusters = fe->i_clusters;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
status = ocfs_journal_dirty(handle, fe_bh);
if (status < 0) {
@@ -1015,12 +1013,12 @@
if (bytes_added)
ocfs2_update_inode_size(inode, newsize);
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_OPEN_DIRECT) {
/* This is a total broken hack for O_DIRECT crack */
OCFS2_I(inode)->ip_mmu_private = i_size_read(inode);
}
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
status = ocfs2_zero_extend(inode);
if (status < 0) {
mlog_errno(status);
Modified: branches/alloc_inode/fs/ocfs2/inode.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/inode.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/inode.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -215,7 +215,6 @@
i->ip_flags = 0;
atomic_set(&i->ip_clean_buffer_seq, 0);
- spin_lock_init(&i->ip_lock);
i->ip_next_orphan = NULL;
init_rwsem(&i->ip_alloc_sem);
@@ -513,14 +512,14 @@
goto bail;
}
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SKIP_DELETE) {
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
mlog(0, "Skipping delete of %lu because another node "
"has done this for us.\n", inode->i_ino);
goto bail;
}
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
/* If we're coming from process_vote we can't go into our own
* voting [hello, deadlock city!], so unforuntately we just
@@ -547,14 +546,14 @@
/* While we were waiting for the lock, another node might have
* asked to delete the inode. Recheck our flags to catch this
* race and just clear_inode instead.*/
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SKIP_DELETE) {
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
mlog(0, "Skipping delete of %lu because another node "
"has done this for us.\n", inode->i_ino);
goto bail;
}
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
status = ocfs2_request_delete_vote(inode);
if (status < 0) {
@@ -567,9 +566,9 @@
goto bail;
}
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
orphaned_slot = OCFS2_I(inode)->ip_orphaned_slot;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
if (orphaned_slot == OCFS_INVALID_NODE_NUM) {
/* Nobody knew which slot this inode was orphaned
@@ -580,9 +579,9 @@
OCFS2_I(inode)->ip_blkno);
/* XXX: Is this really necessary? */
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
SET_INODE_DELETED(inode);
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
goto bail;
}
@@ -722,7 +721,6 @@
{
int status;
struct ocfs2_inode_info *oi = OCFS2_I(inode);
- ocfs_super *osb;
mlog_entry_void();
@@ -732,9 +730,6 @@
mlog(0, "Clearing inode: %"MLFu64", nlink = %u)\n",
OCFS2_I(inode)->ip_blkno, inode->i_nlink);
- /* we should not really be using osb in this context. */
- osb = OCFS2_SB(inode->i_sb);
-
if (!inode->u.generic_ip) {
mlog(ML_ERROR, "inode %lu has no generic_ip!\n", inode->i_ino);
goto bail;
@@ -769,22 +764,23 @@
OCFS_I(inode)->ip_flags &= ~OCFS_INODE_INITIALIZED;
- if (oi->ip_open_count)
- mlog(ML_ERROR,
- "Clear inode of %"MLFu64" has open count %d\n",
- oi->ip_blkno, oi->ip_open_count);
- if (!list_empty(&oi->ip_handle_list))
- mlog(ML_ERROR,
- "Clear inode of %"MLFu64" has non empty handle list\n",
- oi->ip_blkno);
- if (oi->ip_handle)
- mlog(ML_ERROR,
- "Clear inode of %"MLFu64" has non empty handle pointer\n",
- oi->ip_blkno);
+ mlog_bug_on_msg(spin_is_locked(&oi->ip_lock),
+ "Clear inode of %"MLFu64", inode is locked\n",
+ oi->ip_blkno);
+ mlog_bug_on_msg(oi->ip_open_count,
+ "Clear inode of %"MLFu64" has open count %d\n",
+ oi->ip_blkno, oi->ip_open_count);
+ mlog_bug_on_msg(!list_empty(&oi->ip_handle_list),
+ "Clear inode of %"MLFu64" has non empty handle list\n",
+ oi->ip_blkno);
+ mlog_bug_on_msg(oi->ip_handle,
+ "Clear inode of %"MLFu64" has non empty handle pointer\n",
+ oi->ip_blkno);
+
oi->ip_flags = 0;
- oi->ip_blkno = 0ULL;
oi->ip_created_trans = 0;
oi->ip_last_trans = 0;
+ oi->ip_blkno = 0ULL;
/* clean out the inode private ... why?! */
memset(inode->u.generic_ip, 0, sizeof(ocfs_inode_private));
@@ -874,14 +870,14 @@
osb = OCFS2_SB(inode->i_sb);
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
if (INODE_DELETED(inode)) {
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
mlog(0, "inode deleted!\n");
status = -ENOENT;
goto bail;
}
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
status = ocfs2_meta_lock(inode, NULL, NULL, 0);
if (status < 0) {
@@ -918,9 +914,9 @@
goto leave;
}
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
fe->i_clusters = OCFS2_I(inode)->ip_clusters;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
fe->i_size = (u64)i_size_read(inode);
fe->i_links_count = inode->i_nlink;
@@ -955,7 +951,7 @@
{
ocfs_super *osb = OCFS2_SB(inode->i_sb);
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
OCFS2_I(inode)->ip_clusters = fe->i_clusters;
i_size_write(inode, fe->i_size);
@@ -975,7 +971,7 @@
inode->i_mtime.tv_sec = fe->i_mtime;
inode->i_ctime.tv_sec = fe->i_ctime;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
} /* ocfs_refresh_inode */
Modified: branches/alloc_inode/fs/ocfs2/journal.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/journal.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/journal.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -1469,9 +1469,9 @@
iter = OCFS_I(inode)->ip_next_orphan;
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
OCFS2_I(inode)->ip_orphaned_slot = slot;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
iput(inode);
Modified: branches/alloc_inode/fs/ocfs2/mmap.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/mmap.h 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/mmap.h 2005-05-19 19:01:30 UTC (rev 2286)
@@ -28,36 +28,32 @@
static inline void ocfs2_add_io_marker(struct inode *inode,
ocfs2_io_marker *task)
{
- ocfs_inode_private *oip = OCFS_I(inode);
struct ocfs2_inode_info *oi = OCFS2_I(inode);
task->io_task = current;
- spin_lock(&oip->ip_lock);
+ spin_lock(&oi->ip_lock);
list_add(&task->io_list, &oi->ip_io_markers);
- spin_unlock(&oip->ip_lock);
+ spin_unlock(&oi->ip_lock);
}
static inline void ocfs2_del_io_marker(struct inode *inode,
ocfs2_io_marker *task)
{
- ocfs_inode_private *oip = OCFS_I(inode);
-
- spin_lock(&oip->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
if (!list_empty(&task->io_list))
list_del_init(&task->io_list);
- spin_unlock(&oip->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
}
static inline int ocfs2_is_in_io_marker_list(struct inode *inode,
struct task_struct *task)
{
int ret = 0;
- ocfs_inode_private *oip = OCFS_I(inode);
struct ocfs2_inode_info *oi = OCFS2_I(inode);
struct list_head *p;
ocfs2_io_marker *tmp;
- spin_lock(&oip->ip_lock);
+ spin_lock(&oi->ip_lock);
list_for_each(p, &oi->ip_io_markers) {
tmp = list_entry(p, ocfs2_io_marker, io_list);
if (tmp->io_task == task) {
@@ -65,7 +61,7 @@
break;
}
}
- spin_unlock(&oip->ip_lock);
+ spin_unlock(&oi->ip_lock);
return ret;
}
Modified: branches/alloc_inode/fs/ocfs2/namei.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/namei.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/namei.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -2119,9 +2119,9 @@
/* Record which orphan dir our inode now resides
* in. delete_inode will use this to determine which orphan
* dir to lock. */
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
OCFS2_I(inode)->ip_orphaned_slot = osb->slot_num;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
mlog(0, "Inode %"MLFu64" orphaned in slot %d\n",
OCFS2_I(inode)->ip_blkno, osb->slot_num);
Modified: branches/alloc_inode/fs/ocfs2/ocfs.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/ocfs.h 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/ocfs.h 2005-05-19 19:01:30 UTC (rev 2286)
@@ -198,9 +198,6 @@
/* protects allocation changes on this inode. */
struct rw_semaphore ip_alloc_sem;
- /* These fields are protected by ip_lock */
- spinlock_t ip_lock;
-
struct semaphore ip_io_sem;
atomic_t ip_clean_buffer_seq;
Modified: branches/alloc_inode/fs/ocfs2/suballoc.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/suballoc.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/suballoc.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -318,11 +318,11 @@
goto bail;
}
- spin_lock(&OCFS_I(alloc_inode)->ip_lock);
+ spin_lock(&OCFS2_I(alloc_inode)->ip_lock);
OCFS2_I(alloc_inode)->ip_clusters = fe->i_clusters;
fe->i_size = ocfs2_clusters_to_bytes(alloc_inode->i_sb,
fe->i_clusters);
- spin_unlock(&OCFS_I(alloc_inode)->ip_lock);
+ spin_unlock(&OCFS2_I(alloc_inode)->ip_lock);
i_size_write(alloc_inode, fe->i_size);
alloc_inode->i_blocks =
ocfs2_align_bytes_to_sectors(i_size_read(alloc_inode));
Modified: branches/alloc_inode/fs/ocfs2/vote.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/vote.c 2005-05-19 18:33:43 UTC (rev 2285)
+++ branches/alloc_inode/fs/ocfs2/vote.c 2005-05-19 19:01:30 UTC (rev 2286)
@@ -166,7 +166,7 @@
* respond with BUSY he doesn't actually need the orphaned
* slot, but it doesn't hurt to do it here anyway. */
if ((*orphaned_slot) != OCFS_INVALID_NODE_NUM) {
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
mlog_bug_on_msg(OCFS2_I(inode)->ip_orphaned_slot !=
OCFS_INVALID_NODE_NUM &&
@@ -182,27 +182,27 @@
OCFS2_I(inode)->ip_blkno, *orphaned_slot);
OCFS2_I(inode)->ip_orphaned_slot = *orphaned_slot;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
} else {
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
mlog(0, "Sending back orphaned slot %d for inode %"MLFu64"\n",
OCFS2_I(inode)->ip_orphaned_slot,
OCFS2_I(inode)->ip_blkno);
*orphaned_slot = OCFS2_I(inode)->ip_orphaned_slot;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
}
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
/* vote no if the file is still open. */
if (OCFS2_I(inode)->ip_open_count > 0) {
mlog(0, "open count = %u\n",
OCFS2_I(inode)->ip_open_count);
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
goto done;
}
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
/* directories are a bit ugly... What if someone is sitting in
* it? We want to make sure the inode is removed completely as
@@ -225,12 +225,12 @@
* delete on our side. */
response = OCFS2_RESPONSE_OK;
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
SET_INODE_DELETED(inode);
/* We set the SKIP_DELETE flag on the inode so we don't try to
* delete it in delete_inode ourselves. */
OCFS2_I(inode)->ip_flags |= OCFS2_INODE_SKIP_DELETE;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
d_prune_aliases (inode);
@@ -721,7 +721,7 @@
* orphaned in. We verify that the information is correct and
* 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);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
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 "
@@ -730,7 +730,7 @@
orphaned_slot, OCFS2_I(inode)->ip_orphaned_slot);
OCFS2_I(inode)->ip_orphaned_slot = orphaned_slot;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
}
int ocfs2_request_delete_vote(struct inode *inode)
@@ -738,9 +738,9 @@
int orphaned_slot;
struct ocfs2_net_response_cb delete_cb;
- spin_lock(&OCFS_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
orphaned_slot = OCFS2_I(inode)->ip_orphaned_slot;
- spin_unlock(&OCFS_I(inode)->ip_lock);
+ spin_unlock(&OCFS2_I(inode)->ip_lock);
delete_cb.rc_cb = ocfs2_delete_response_cb;
delete_cb.rc_priv = inode;
More information about the Ocfs2-commits
mailing list