[Ocfs2-commits] jlbec commits r2263 - branches/alloc_inode/fs/ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue May 17 16:54:01 CDT 2005
Author: jlbec
Date: 2005-05-17 16:54:00 -0500 (Tue, 17 May 2005)
New Revision: 2263
Modified:
branches/alloc_inode/fs/ocfs2/dlmglue.c
branches/alloc_inode/fs/ocfs2/dlmglue.h
branches/alloc_inode/fs/ocfs2/inode.c
branches/alloc_inode/fs/ocfs2/ocfs.h
branches/alloc_inode/fs/ocfs2/super.c
Log:
o Move ip_meta_lockres and ip_data_lockres to ocfs2_inode_info.
Modified: branches/alloc_inode/fs/ocfs2/dlmglue.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/dlmglue.c 2005-05-17 21:12:51 UTC (rev 2262)
+++ branches/alloc_inode/fs/ocfs2/dlmglue.c 2005-05-17 21:54:00 UTC (rev 2263)
@@ -378,8 +378,10 @@
void ocfs2_lock_res_free(ocfs2_lock_res *res)
{
mlog_entry_void();
+
if (res->l_name)
kfree(res->l_name);
+
mlog_exit_void();
}
@@ -400,6 +402,7 @@
default:
BUG();
}
+
mlog_exit_void();
}
@@ -1082,7 +1085,7 @@
* on a resource which has an invalid one -- we'll set it
* valid when we release the EX. */
- lockres = &OCFS_I(inode)->ip_meta_lockres;
+ lockres = &OCFS2_I(inode)->ip_meta_lockres;
spin_lock(&lockres->l_lock);
OCFS_ASSERT(!(lockres->l_flags & OCFS2_LOCK_ATTACHED));
@@ -1095,7 +1098,7 @@
goto bail;
}
- lockres = &OCFS_I(inode)->ip_data_lockres;
+ lockres = &OCFS2_I(inode)->ip_data_lockres;
spin_lock(&lockres->l_lock);
OCFS_ASSERT(!(lockres->l_flags & OCFS2_LOCK_ATTACHED));
@@ -1128,7 +1131,7 @@
OCFS2_I(inode)->ip_blkno,
write ? "EXMODE" : "PRMODE");
- lockres = &OCFS_I(inode)->ip_data_lockres;
+ lockres = &OCFS2_I(inode)->ip_data_lockres;
level = write ? LKM_EXMODE : LKM_PRMODE;
@@ -1176,7 +1179,7 @@
int write)
{
int level = write ? LKM_EXMODE : LKM_PRMODE;
- ocfs2_lock_res *lockres = &OCFS_I(inode)->ip_data_lockres;
+ ocfs2_lock_res *lockres = &OCFS2_I(inode)->ip_data_lockres;
mlog_entry_void();
@@ -1196,7 +1199,7 @@
* date from the truncate code. */
static void __ocfs2_stuff_meta_lvb(struct inode *inode)
{
- ocfs2_lock_res *lockres = &OCFS_I(inode)->ip_meta_lockres;
+ ocfs2_lock_res *lockres = &OCFS2_I(inode)->ip_meta_lockres;
ocfs2_meta_lvb *lvb = (ocfs2_meta_lvb *) lockres->l_lksb.lvb;
mlog_entry_void();
@@ -1216,8 +1219,7 @@
static void ocfs2_refresh_inode_from_lvb(struct inode *inode)
{
- ocfs_inode_private *oip = OCFS_I(inode);
- ocfs2_lock_res *lockres = &oip->ip_meta_lockres;
+ ocfs2_lock_res *lockres = &OCFS2_I(inode)->ip_meta_lockres;
ocfs2_meta_lvb *lvb = (ocfs2_meta_lvb *) lockres->l_lksb.lvb;
mlog_entry_void();
@@ -1234,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(&oip->ip_lock);
+ spin_lock(&OCFS_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);
@@ -1249,14 +1251,14 @@
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(&oip->ip_lock);
+ spin_unlock(&OCFS_I(inode)->ip_lock);
mlog_exit_void();
}
static void ocfs2_reset_meta_lvb_values(struct inode *inode)
{
- ocfs2_lock_res *lockres = &OCFS_I(inode)->ip_meta_lockres;
+ ocfs2_lock_res *lockres = &OCFS2_I(inode)->ip_meta_lockres;
ocfs2_meta_lvb *lvb = (ocfs2_meta_lvb *) lockres->l_lksb.lvb;
u32 i_clusters;
@@ -1374,7 +1376,7 @@
OCFS2_I(inode)->ip_flags);
spin_unlock(&OCFS_I(inode)->ip_lock);
- lockres = &OCFS_I(inode)->ip_meta_lockres;
+ lockres = &OCFS2_I(inode)->ip_meta_lockres;
if (!ocfs2_should_refresh_lock_res(lockres))
goto bail;
@@ -1494,7 +1496,7 @@
return status;
}
- lockres = &OCFS_I(inode)->ip_meta_lockres;
+ lockres = &OCFS2_I(inode)->ip_meta_lockres;
level = ex ? LKM_EXMODE : LKM_PRMODE;
dlm_flags = 0;
if (flags & OCFS2_META_LOCK_NOQUEUE)
@@ -1604,7 +1606,7 @@
int ex)
{
int level = ex ? LKM_EXMODE : LKM_PRMODE;
- ocfs2_lock_res *lockres = &OCFS_I(inode)->ip_meta_lockres;
+ ocfs2_lock_res *lockres = &OCFS2_I(inode)->ip_meta_lockres;
mlog_entry_void();
@@ -1881,7 +1883,7 @@
mlog_entry_void();
err = ocfs2_drop_lock(OCFS2_SB(inode->i_sb),
- &OCFS_I(inode)->ip_data_lockres,
+ &OCFS2_I(inode)->ip_data_lockres,
NULL);
if (err < 0)
mlog_errno(err);
@@ -1889,7 +1891,7 @@
status = err;
err = ocfs2_drop_lock(OCFS2_SB(inode->i_sb),
- &OCFS_I(inode)->ip_meta_lockres,
+ &OCFS2_I(inode)->ip_meta_lockres,
&meta_dcb);
if (err < 0)
mlog_errno(err);
@@ -2033,7 +2035,7 @@
mlog_entry_void();
- lockres = &OCFS_I(inode)->ip_meta_lockres;
+ lockres = &OCFS2_I(inode)->ip_meta_lockres;
spin_lock(&lockres->l_lock);
@@ -2368,3 +2370,19 @@
mlog_exit_void();
}
+
+void ocfs2_meta_lvb_set_trunc_clusters(struct inode *inode,
+ unsigned int trunc_clusters)
+{
+ ocfs2_lock_res *lockres = &OCFS2_I(inode)->ip_meta_lockres;
+ ocfs2_meta_lvb *lvb;
+
+ spin_lock(&lockres->l_lock);
+ OCFS_ASSERT(lockres->l_level == LKM_EXMODE);
+
+ lvb = (ocfs2_meta_lvb *) lockres->l_lksb.lvb;
+ if (be32_to_cpu(lvb->lvb_trunc_clusters) > trunc_clusters)
+ lvb->lvb_trunc_clusters = cpu_to_be32(trunc_clusters);
+ spin_unlock(&lockres->l_lock);
+}
+
Modified: branches/alloc_inode/fs/ocfs2/dlmglue.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/dlmglue.h 2005-05-17 21:12:51 UTC (rev 2262)
+++ branches/alloc_inode/fs/ocfs2/dlmglue.h 2005-05-17 21:54:00 UTC (rev 2263)
@@ -115,19 +115,7 @@
void ocfs2_process_blocked_lock(ocfs_super *osb,
ocfs2_lock_res *lockres);
-static inline void ocfs2_meta_lvb_set_trunc_clusters(struct inode *inode,
- unsigned int trunc_clusters)
-{
- ocfs2_lock_res *lockres = &OCFS_I(inode)->ip_meta_lockres;
- ocfs2_meta_lvb *lvb;
+void ocfs2_meta_lvb_set_trunc_clusters(struct inode *inode,
+ unsigned int trunc_clusters);
- spin_lock(&lockres->l_lock);
- OCFS_ASSERT(lockres->l_level == LKM_EXMODE);
-
- lvb = (ocfs2_meta_lvb *) lockres->l_lksb.lvb;
- if (be32_to_cpu(lvb->lvb_trunc_clusters) > trunc_clusters)
- lvb->lvb_trunc_clusters = cpu_to_be32(trunc_clusters);
- spin_unlock(&lockres->l_lock);
-}
-
#endif /* DLMGLUE_H */
Modified: branches/alloc_inode/fs/ocfs2/inode.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/inode.c 2005-05-17 21:12:51 UTC (rev 2262)
+++ branches/alloc_inode/fs/ocfs2/inode.c 2005-05-17 21:54:00 UTC (rev 2263)
@@ -346,13 +346,13 @@
break;
}
- status = ocfs2_inode_lock_res_init(&OCFS_I(inode)->ip_meta_lockres,
+ status = ocfs2_inode_lock_res_init(&OCFS2_I(inode)->ip_meta_lockres,
OCFS_TYPE_META, inode);
if (status < 0) {
mlog_errno(status);
goto bail;
}
- status = ocfs2_inode_lock_res_init(&OCFS_I(inode)->ip_data_lockres,
+ status = ocfs2_inode_lock_res_init(&OCFS2_I(inode)->ip_data_lockres,
OCFS_TYPE_DATA, inode);
if (status < 0)
mlog_errno(status);
@@ -771,8 +771,8 @@
if (status < 0)
mlog_errno(status);
- ocfs2_lock_res_free(&OCFS_I(inode)->ip_meta_lockres);
- ocfs2_lock_res_free(&OCFS_I(inode)->ip_data_lockres);
+ ocfs2_lock_res_free(&OCFS2_I(inode)->ip_meta_lockres);
+ ocfs2_lock_res_free(&OCFS2_I(inode)->ip_data_lockres);
OCFS_I(inode)->ip_flags &= ~OCFS_INODE_INITIALIZED;
Modified: branches/alloc_inode/fs/ocfs2/ocfs.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/ocfs.h 2005-05-17 21:12:51 UTC (rev 2262)
+++ branches/alloc_inode/fs/ocfs2/ocfs.h 2005-05-17 21:54:00 UTC (rev 2263)
@@ -199,15 +199,11 @@
* read. */
struct inode *ip_inode;
- ocfs2_lock_res ip_meta_lockres;
- ocfs2_lock_res ip_data_lockres;
-
/* protects allocation changes on this inode. */
struct rw_semaphore ip_alloc_sem;
/* These fields are protected by ip_lock */
spinlock_t ip_lock;
- struct ocfs2_extent_map ip_map;
struct list_head ip_io_markers;
struct semaphore ip_io_sem;
Modified: branches/alloc_inode/fs/ocfs2/super.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/super.c 2005-05-17 21:12:51 UTC (rev 2262)
+++ branches/alloc_inode/fs/ocfs2/super.c 2005-05-17 21:54:00 UTC (rev 2263)
@@ -556,7 +556,7 @@
INIT_LIST_HEAD(&oi->ip_io_markers);
oi->ip_handle = NULL;
oi->ip_next_orphan = NULL;
-
+
init_rwsem(&oi->ip_alloc_sem);
init_MUTEX(&(oi->ip_io_sem));
More information about the Ocfs2-commits
mailing list