[Ocfs2-commits] jlbec commits r2680 - branches/enotypedefs/fs/ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Nov 8 14:55:21 CST 2005
Author: jlbec
Date: 2005-11-08 14:55:17 -0600 (Tue, 08 Nov 2005)
New Revision: 2680
Modified:
branches/enotypedefs/fs/ocfs2/alloc.c
branches/enotypedefs/fs/ocfs2/alloc.h
branches/enotypedefs/fs/ocfs2/aops.c
branches/enotypedefs/fs/ocfs2/aops.h
branches/enotypedefs/fs/ocfs2/dir.c
branches/enotypedefs/fs/ocfs2/dir.h
branches/enotypedefs/fs/ocfs2/dlmglue.c
branches/enotypedefs/fs/ocfs2/dlmglue.h
branches/enotypedefs/fs/ocfs2/file.c
branches/enotypedefs/fs/ocfs2/file.h
branches/enotypedefs/fs/ocfs2/inode.c
branches/enotypedefs/fs/ocfs2/inode.h
branches/enotypedefs/fs/ocfs2/journal.c
branches/enotypedefs/fs/ocfs2/journal.h
branches/enotypedefs/fs/ocfs2/localalloc.c
branches/enotypedefs/fs/ocfs2/localalloc.h
branches/enotypedefs/fs/ocfs2/namei.c
branches/enotypedefs/fs/ocfs2/namei.h
branches/enotypedefs/fs/ocfs2/ocfs2.h
branches/enotypedefs/fs/ocfs2/suballoc.c
branches/enotypedefs/fs/ocfs2/suballoc.h
branches/enotypedefs/fs/ocfs2/super.c
Log:
o Get rid of the journal typedefs.
Modified: branches/enotypedefs/fs/ocfs2/alloc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/alloc.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/alloc.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -52,14 +52,14 @@
u64 blkno);
static int ocfs2_create_new_meta_bhs(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
int wanted,
ocfs2_alloc_context *meta_ac,
struct buffer_head *bhs[]);
static int ocfs2_add_branch(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
struct buffer_head *eb_bh,
@@ -67,14 +67,14 @@
ocfs2_alloc_context *meta_ac);
static int ocfs2_shift_tree_depth(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
ocfs2_alloc_context *meta_ac,
struct buffer_head **ret_new_eb_bh);
static int ocfs2_do_insert_extent(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
u64 blkno,
@@ -152,7 +152,7 @@
* l_count for you
*/
static int ocfs2_create_new_meta_bhs(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
int wanted,
ocfs2_alloc_context *meta_ac,
@@ -253,7 +253,7 @@
* contain a single record with e_clusters == 0.
*/
static int ocfs2_add_branch(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
struct buffer_head *eb_bh,
@@ -418,7 +418,7 @@
* after this call.
*/
static int ocfs2_shift_tree_depth(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
ocfs2_alloc_context *meta_ac,
@@ -520,7 +520,7 @@
* down.
*/
static int ocfs2_do_insert_extent(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
u64 start_blk,
@@ -810,7 +810,7 @@
/* the caller needs to update fe->i_clusters */
int ocfs2_insert_extent(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
u64 start_blk,
@@ -952,7 +952,7 @@
}
static int ocfs2_truncate_log_append(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
u64 start_blk,
unsigned int num_clusters)
{
@@ -1034,7 +1034,7 @@
}
static int ocfs2_replay_truncate_records(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *data_alloc_inode,
struct buffer_head *data_alloc_bh)
{
@@ -1113,7 +1113,7 @@
{
int status;
unsigned int num_to_flush;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
struct inode *tl_inode = osb->osb_tl_inode;
struct inode *data_alloc_inode = NULL;
struct buffer_head *tl_bh = osb->osb_tl_bh;
@@ -1347,7 +1347,7 @@
int i;
unsigned int clusters, num_recs, start_cluster;
u64 start_blk;
- ocfs2_journal_handle *handle;
+ struct ocfs2_journal_handle *handle;
struct inode *tl_inode = osb->osb_tl_inode;
ocfs2_truncate_log *tl;
@@ -1542,7 +1542,7 @@
struct inode *inode,
struct buffer_head *fe_bh,
struct buffer_head *old_last_eb_bh,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct ocfs2_truncate_context *tc)
{
int status, i, depth;
@@ -1769,7 +1769,7 @@
ocfs2_extent_block *eb;
ocfs2_extent_list *el;
struct buffer_head *last_eb_bh;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
struct inode *tl_inode = osb->osb_tl_inode;
mlog_entry_void();
Modified: branches/enotypedefs/fs/ocfs2/alloc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/alloc.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/alloc.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -28,7 +28,7 @@
struct _ocfs2_alloc_context;
int ocfs2_insert_extent(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
u64 blkno,
Modified: branches/enotypedefs/fs/ocfs2/aops.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/aops.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/aops.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -341,13 +341,13 @@
return ret;
}
-ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode,
- struct page *page,
- unsigned from,
- unsigned to)
+struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode,
+ struct page *page,
+ unsigned from,
+ unsigned to)
{
ocfs2_super *osb = OCFS2_SB(inode->i_sb);
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
int ret = 0;
handle = ocfs2_start_trans(osb, NULL, OCFS2_INODE_UPDATE_CREDITS);
@@ -381,7 +381,7 @@
loff_t new_i_size;
struct buffer_head *di_bh = NULL;
struct inode *inode = page->mapping->host;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
mlog_entry("(0x%p, 0x%p, %u, %u)\n", file, page, from, to);
Modified: branches/enotypedefs/fs/ocfs2/aops.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/aops.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/aops.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -25,10 +25,10 @@
int ocfs2_prepare_write(struct file *file, struct page *page,
unsigned from, unsigned to);
-ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode,
- struct page *page,
- unsigned from,
- unsigned to);
+struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode,
+ struct page *page,
+ unsigned from,
+ unsigned to);
/* all ocfs2_dio_end_io()'s fault */
#define ocfs2_iocb_is_rw_locked(iocb) \
Modified: branches/enotypedefs/fs/ocfs2/dir.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dir.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/dir.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -340,7 +340,7 @@
/* returns a bh of the 1st new block in the allocation. */
int ocfs2_do_extend_dir(struct super_block *sb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *dir,
struct buffer_head *parent_fe_bh,
ocfs2_alloc_context *data_ac,
@@ -398,7 +398,7 @@
ocfs2_dinode *fe = (ocfs2_dinode *) parent_fe_bh->b_data;
ocfs2_alloc_context *data_ac = NULL;
ocfs2_alloc_context *meta_ac = NULL;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
struct buffer_head *new_bh = NULL;
struct ocfs2_dir_entry * de;
struct super_block *sb = osb->sb;
Modified: branches/enotypedefs/fs/ocfs2/dir.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/dir.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/dir.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -45,7 +45,7 @@
struct buffer_head **ret_de_bh);
struct _ocfs2_alloc_context;
int ocfs2_do_extend_dir(struct super_block *sb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *dir,
struct buffer_head *parent_fe_bh,
struct _ocfs2_alloc_context *data_ac,
Modified: branches/enotypedefs/fs/ocfs2/dlmglue.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlmglue.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/dlmglue.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -1554,7 +1554,7 @@
* the result of the lock will be communicated via the callback.
*/
int ocfs2_meta_lock_full(struct inode *inode,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct buffer_head **ret_bh,
int ex,
int arg_flags)
@@ -1676,7 +1676,7 @@
* the lock inversion simply.
*/
int ocfs2_meta_lock_with_page(struct inode *inode,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct buffer_head **ret_bh,
int ex,
struct page *page)
Modified: branches/enotypedefs/fs/ocfs2/dlmglue.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlmglue.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/dlmglue.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -72,12 +72,12 @@
int ocfs2_rw_lock(struct inode *inode, int write);
void ocfs2_rw_unlock(struct inode *inode, int write);
int ocfs2_meta_lock_full(struct inode *inode,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct buffer_head **ret_bh,
int ex,
int arg_flags);
int ocfs2_meta_lock_with_page(struct inode *inode,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct buffer_head **ret_bh,
int ex,
struct page *page);
Modified: branches/enotypedefs/fs/ocfs2/file.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/file.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/file.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -142,7 +142,7 @@
return (err < 0) ? -EIO : 0;
}
-int ocfs2_set_inode_size(ocfs2_journal_handle *handle,
+int ocfs2_set_inode_size(struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
u64 new_i_size)
@@ -172,7 +172,7 @@
{
int ret;
ocfs2_super *osb = OCFS2_SB(inode->i_sb);
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
handle = ocfs2_start_trans(osb, NULL,
OCFS2_INODE_UPDATE_CREDITS);
@@ -198,7 +198,7 @@
u64 new_i_size)
{
int status;
- ocfs2_journal_handle *handle;
+ struct ocfs2_journal_handle *handle;
mlog_entry_void();
@@ -330,7 +330,7 @@
struct inode *inode,
u32 clusters_to_add,
struct buffer_head *fe_bh,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context *data_ac,
ocfs2_alloc_context *meta_ac,
enum ocfs2_alloc_restarted *reason_ret)
@@ -435,7 +435,7 @@
u32 prev_clusters;
struct buffer_head *bh = NULL;
ocfs2_dinode *fe = NULL;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
ocfs2_alloc_context *data_ac = NULL;
ocfs2_alloc_context *meta_ac = NULL;
enum ocfs2_alloc_restarted why;
@@ -625,7 +625,7 @@
struct page *page;
unsigned long index;
unsigned int offset;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
int ret;
offset = (size & (PAGE_CACHE_SIZE-1)); /* Within page */
@@ -750,7 +750,7 @@
struct super_block *sb = inode->i_sb;
ocfs2_super *osb = OCFS2_SB(sb);
struct buffer_head *bh = NULL;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
mlog_entry("(0x%p, '%.*s')\n", dentry,
dentry->d_name.len, dentry->d_name.name);
Modified: branches/enotypedefs/fs/ocfs2/file.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/file.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/file.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -41,7 +41,7 @@
struct inode *inode,
u32 clusters_to_add,
struct buffer_head *fe_bh,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct _ocfs2_alloc_context *data_ac,
struct _ocfs2_alloc_context *meta_ac,
enum ocfs2_alloc_restarted *reason);
@@ -49,7 +49,7 @@
int ocfs2_getattr(struct vfsmount *mnt, struct dentry *dentry,
struct kstat *stat);
-int ocfs2_set_inode_size(ocfs2_journal_handle *handle,
+int ocfs2_set_inode_size(struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
u64 new_i_size);
Modified: branches/enotypedefs/fs/ocfs2/inode.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/inode.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/inode.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -416,7 +416,7 @@
struct buffer_head *fe_bh)
{
int status = 0;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
struct ocfs2_truncate_context *tc = NULL;
ocfs2_dinode *fe;
@@ -472,7 +472,7 @@
int status;
struct inode *inode_alloc_inode = NULL;
struct buffer_head *inode_alloc_bh = NULL;
- ocfs2_journal_handle *handle;
+ struct ocfs2_journal_handle *handle;
ocfs2_super *osb = OCFS2_SB(inode->i_sb);
ocfs2_dinode *di = (ocfs2_dinode *) di_bh->b_data;
@@ -1065,7 +1065,7 @@
* struct inode.
* Only takes ip_lock.
*/
-int ocfs2_mark_inode_dirty(ocfs2_journal_handle *handle,
+int ocfs2_mark_inode_dirty(struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *bh)
{
Modified: branches/enotypedefs/fs/ocfs2/inode.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/inode.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/inode.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -31,46 +31,46 @@
{
u64 ip_blkno;
- struct ocfs2_lock_res ip_rw_lockres;
- struct ocfs2_lock_res ip_meta_lockres;
- struct ocfs2_lock_res ip_data_lockres;
+ struct ocfs2_lock_res ip_rw_lockres;
+ struct ocfs2_lock_res ip_meta_lockres;
+ struct ocfs2_lock_res ip_data_lockres;
/* protects allocation changes on this inode. */
- struct rw_semaphore ip_alloc_sem;
+ struct rw_semaphore ip_alloc_sem;
/* These fields are protected by ip_lock */
- spinlock_t ip_lock;
- u32 ip_open_count;
- u32 ip_clusters;
- struct ocfs2_extent_map ip_map;
- struct list_head ip_io_markers;
- int ip_orphaned_slot;
+ spinlock_t ip_lock;
+ u32 ip_open_count;
+ u32 ip_clusters;
+ struct ocfs2_extent_map ip_map;
+ struct list_head ip_io_markers;
+ int ip_orphaned_slot;
- struct semaphore ip_io_sem;
+ struct semaphore ip_io_sem;
/* Used by the journalling code to attach an inode to a
* handle. These are protected by ip_io_sem in order to lock
* out other I/O to the inode until we either commit or
* abort. */
- struct list_head ip_handle_list;
- ocfs2_journal_handle *ip_handle;
+ struct list_head ip_handle_list;
+ struct ocfs2_journal_handle *ip_handle;
- u32 ip_flags; /* see below */
+ u32 ip_flags; /* see below */
/* protected by recovery_lock. */
- struct inode *ip_next_orphan;
+ struct inode *ip_next_orphan;
- u32 ip_dir_start_lookup;
+ u32 ip_dir_start_lookup;
/* next two are protected by trans_inc_lock */
/* which transaction were we created on? Zero if none. */
- unsigned long ip_created_trans;
+ unsigned long ip_created_trans;
/* last transaction we were a part of. */
- unsigned long ip_last_trans;
+ unsigned long ip_last_trans;
struct ocfs2_caching_info ip_metadata_cache;
- struct inode vfs_inode;
+ struct inode vfs_inode;
};
/*
@@ -136,7 +136,7 @@
void ocfs2_sync_blockdev(struct super_block *sb);
void ocfs2_refresh_inode(struct inode *inode,
ocfs2_dinode *fe);
-int ocfs2_mark_inode_dirty(ocfs2_journal_handle *handle,
+int ocfs2_mark_inode_dirty(struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *bh);
int ocfs2_aio_read(struct file *file, struct kiocb *req, struct iocb *iocb);
Modified: branches/enotypedefs/fs/ocfs2/journal.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/journal.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/journal.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -57,9 +57,9 @@
static int __ocfs2_recovery_thread(void *arg);
static int ocfs2_commit_cache(ocfs2_super *osb);
static int ocfs2_wait_on_mount(ocfs2_super *osb);
-static void ocfs2_handle_cleanup_locks(ocfs2_journal *journal,
- ocfs2_journal_handle *handle);
-static void ocfs2_commit_unstarted_handle(ocfs2_journal_handle *handle);
+static void ocfs2_handle_cleanup_locks(struct ocfs2_journal *journal,
+ struct ocfs2_journal_handle *handle);
+static void ocfs2_commit_unstarted_handle(struct ocfs2_journal_handle *handle);
static int ocfs2_journal_toggle_dirty(ocfs2_super *osb,
int dirty);
static int ocfs2_trylock_journal(ocfs2_super *osb,
@@ -73,7 +73,7 @@
int status = 0;
unsigned int flushed;
unsigned long old_id;
- ocfs2_journal *journal = NULL;
+ struct ocfs2_journal *journal = NULL;
mlog_entry_void();
@@ -113,9 +113,9 @@
return status;
}
-ocfs2_journal_handle *ocfs2_alloc_handle(ocfs2_super *osb)
+struct ocfs2_journal_handle *ocfs2_alloc_handle(ocfs2_super *osb)
{
- ocfs2_journal_handle *retval = NULL;
+ struct ocfs2_journal_handle *retval = NULL;
retval = kcalloc(1, sizeof(*retval), GFP_KERNEL);
if (!retval) {
@@ -138,9 +138,9 @@
/* pass it NULL and it will allocate a new handle object for you. If
* you pass it a handle however, it may still return error, in which
* case it has free'd the passed handle for you. */
-ocfs2_journal_handle *ocfs2_start_trans(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
- int max_buffs)
+struct ocfs2_journal_handle *ocfs2_start_trans(ocfs2_super *osb,
+ struct ocfs2_journal_handle *handle,
+ int max_buffs)
{
int ret;
journal_t *journal = osb->journal->j_journal;
@@ -207,7 +207,7 @@
return ERR_PTR(ret);
}
-void ocfs2_handle_add_inode(ocfs2_journal_handle *handle,
+void ocfs2_handle_add_inode(struct ocfs2_journal_handle *handle,
struct inode *inode)
{
BUG_ON(!handle);
@@ -227,7 +227,7 @@
list_add_tail(&(OCFS2_I(inode)->ip_handle_list), &(handle->inode_list));
}
-static void ocfs2_handle_unlock_inodes(ocfs2_journal_handle *handle)
+static void ocfs2_handle_unlock_inodes(struct ocfs2_journal_handle *handle)
{
struct list_head *p, *n;
struct inode *inode;
@@ -248,7 +248,7 @@
/* This is trivial so we do it out of the main commit
* paths. Beware, it can be called from start_trans too! */
-static void ocfs2_commit_unstarted_handle(ocfs2_journal_handle *handle)
+static void ocfs2_commit_unstarted_handle(struct ocfs2_journal_handle *handle)
{
mlog_entry_void();
@@ -264,11 +264,11 @@
mlog_exit_void();
}
-void ocfs2_commit_trans(ocfs2_journal_handle *handle)
+void ocfs2_commit_trans(struct ocfs2_journal_handle *handle)
{
handle_t *jbd_handle;
int retval;
- ocfs2_journal *journal = handle->journal;
+ struct ocfs2_journal *journal = handle->journal;
mlog_entry_void();
@@ -328,7 +328,7 @@
* good because transaction ids haven't yet been recorded on the
* cluster locks associated with this handle.
*/
-int ocfs2_extend_trans(ocfs2_journal_handle *handle,
+int ocfs2_extend_trans(struct ocfs2_journal_handle *handle,
int nblocks)
{
int status;
@@ -366,7 +366,7 @@
return status;
}
-int ocfs2_journal_access(ocfs2_journal_handle *handle,
+int ocfs2_journal_access(struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *bh,
int type)
@@ -426,7 +426,7 @@
return status;
}
-int ocfs2_journal_dirty(ocfs2_journal_handle *handle,
+int ocfs2_journal_dirty(struct ocfs2_journal_handle *handle,
struct buffer_head *bh)
{
int status;
@@ -459,11 +459,11 @@
}
/* We always assume you're adding a metadata lock at level 'ex' */
-int ocfs2_handle_add_lock(ocfs2_journal_handle *handle,
+int ocfs2_handle_add_lock(struct ocfs2_journal_handle *handle,
struct inode *inode)
{
int status;
- ocfs2_journal_lock *lock;
+ struct ocfs2_journal_lock *lock;
BUG_ON(!inode);
@@ -487,15 +487,16 @@
return status;
}
-static void ocfs2_handle_cleanup_locks(ocfs2_journal *journal,
- ocfs2_journal_handle *handle)
+static void ocfs2_handle_cleanup_locks(struct ocfs2_journal *journal,
+ struct ocfs2_journal_handle *handle)
{
struct list_head *p, *n;
- ocfs2_journal_lock *lock;
+ struct ocfs2_journal_lock *lock;
struct inode *inode;
list_for_each_safe(p, n, &(handle->locks)) {
- lock = list_entry(p, ocfs2_journal_lock, jl_lock_list);
+ lock = list_entry(p, struct ocfs2_journal_lock,
+ jl_lock_list);
list_del(&lock->jl_lock_list);
handle->num_locks--;
@@ -525,7 +526,7 @@
spin_unlock(&journal->j_state_lock);
}
-int ocfs2_journal_init(ocfs2_journal *journal, int *dirty)
+int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty)
{
int status = -1;
struct inode *inode = NULL; /* the journal inode */
@@ -625,7 +626,7 @@
{
int status;
unsigned int flags;
- ocfs2_journal *journal = osb->journal;
+ struct ocfs2_journal *journal = osb->journal;
struct buffer_head *bh = journal->j_bh;
ocfs2_dinode *fe;
@@ -664,7 +665,7 @@
*/
void ocfs2_journal_shutdown(ocfs2_super *osb)
{
- ocfs2_journal *journal = NULL;
+ struct ocfs2_journal *journal = NULL;
int status = 0;
struct inode *inode = NULL;
int num_running_trans = 0;
@@ -753,7 +754,7 @@
}
}
-int ocfs2_journal_load(ocfs2_journal *journal)
+int ocfs2_journal_load(struct ocfs2_journal *journal)
{
int status = 0;
ocfs2_super *osb;
@@ -798,7 +799,7 @@
/* 'full' flag tells us whether we clear out all blocks or if we just
* mark the journal clean */
-int ocfs2_journal_wipe(ocfs2_journal *journal, int full)
+int ocfs2_journal_wipe(struct ocfs2_journal *journal, int full)
{
int status;
@@ -910,7 +911,7 @@
{
int ret;
ocfs2_super *osb = data;
- ocfs2_journal *journal = osb->journal;
+ struct ocfs2_journal *journal = osb->journal;
ocfs2_dinode *la_dinode, *tl_dinode;
struct ocfs2_la_recovery_item *item;
struct list_head *p, *n;
@@ -970,7 +971,7 @@
/* NOTE: This function always eats your references to la_dinode and
* tl_dinode, either manually on error, or by passing them to
* ocfs2_complete_recovery */
-static void ocfs2_queue_recovery_completion(ocfs2_journal *journal,
+static void ocfs2_queue_recovery_completion(struct ocfs2_journal *journal,
int slot_num,
ocfs2_dinode *la_dinode,
ocfs2_dinode *tl_dinode)
@@ -1007,7 +1008,7 @@
* recovery for it's own slot. */
void ocfs2_complete_mount_recovery(ocfs2_super *osb)
{
- ocfs2_journal *journal = osb->journal;
+ struct ocfs2_journal *journal = osb->journal;
if (osb->dirty) {
/* No need to queue up our truncate_log as regular
@@ -1574,7 +1575,7 @@
{
int status;
ocfs2_super *osb = arg;
- ocfs2_journal *journal = osb->journal;
+ struct ocfs2_journal *journal = osb->journal;
/* we can trust j_num_trans here because _should_stop() is only set in
* shutdown and nobody other than ourselves should be able to start
Modified: branches/enotypedefs/fs/ocfs2/journal.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/journal.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/journal.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -39,10 +39,9 @@
struct _ocfs2_super;
struct _ocfs2_dinode;
-struct _ocfs2_journal_handle;
+struct ocfs2_journal_handle;
-typedef struct _ocfs2_journal ocfs2_journal;
-struct _ocfs2_journal {
+struct ocfs2_journal {
enum ocfs2_journal_state j_state; /* Journals current state */
journal_t *j_journal; /* The kernels journal type */
@@ -72,7 +71,7 @@
extern spinlock_t trans_inc_lock;
/* wrap j_trans_id so we never have it equal to zero. */
-static inline unsigned long ocfs2_inc_trans_id(ocfs2_journal *j)
+static inline unsigned long ocfs2_inc_trans_id(struct ocfs2_journal *j)
{
unsigned long old_id;
spin_lock(&trans_inc_lock);
@@ -83,7 +82,7 @@
return old_id;
}
-static inline void ocfs2_set_inode_lock_trans(ocfs2_journal *journal,
+static inline void ocfs2_set_inode_lock_trans(struct ocfs2_journal *journal,
struct inode *inode)
{
spin_lock(&trans_inc_lock);
@@ -99,7 +98,7 @@
static inline int ocfs2_inode_fully_checkpointed(struct inode *inode)
{
int ret;
- ocfs2_journal *journal = OCFS2_SB(inode->i_sb)->journal;
+ struct ocfs2_journal *journal = OCFS2_SB(inode->i_sb)->journal;
spin_lock(&trans_inc_lock);
ret = time_after(journal->j_trans_id, OCFS2_I(inode)->ip_last_trans);
@@ -129,7 +128,7 @@
}
static inline void ocfs2_inode_set_new(ocfs2_super *osb,
- struct inode *inode)
+ struct inode *inode)
{
spin_lock(&trans_inc_lock);
OCFS2_I(inode)->ip_created_trans = osb->journal->j_trans_id;
@@ -138,15 +137,14 @@
extern kmem_cache_t *ocfs2_lock_cache;
-typedef struct _ocfs2_journal_lock ocfs2_journal_lock;
-struct _ocfs2_journal_lock {
+struct ocfs2_journal_lock {
struct inode *jl_inode;
struct list_head jl_lock_list;
};
-struct _ocfs2_journal_handle {
+struct ocfs2_journal_handle {
handle_t *k_handle; /* kernel handle. */
- ocfs2_journal *journal;
+ struct ocfs2_journal *journal;
u32 flags; /* see flags below. */
int max_buffs; /* Buffs reserved by this handle */
@@ -162,12 +160,12 @@
#define OCFS2_HANDLE_STARTED 1
/* should we sync-commit this handle? */
#define OCFS2_HANDLE_SYNC 2
-static inline int ocfs2_handle_started(ocfs2_journal_handle *handle)
+static inline int ocfs2_handle_started(struct ocfs2_journal_handle *handle)
{
return handle->flags & OCFS2_HANDLE_STARTED;
}
-static inline void ocfs2_handle_set_sync(ocfs2_journal_handle *handle, int sync)
+static inline void ocfs2_handle_set_sync(struct ocfs2_journal_handle *handle, int sync)
{
if (sync)
handle->flags |= OCFS2_HANDLE_SYNC;
@@ -195,12 +193,12 @@
* ocfs2_start_checkpoint - Kick the commit thread to do a checkpoint.
*/
void ocfs2_set_journal_params(ocfs2_super *osb);
-int ocfs2_journal_init(ocfs2_journal *journal,
+int ocfs2_journal_init(struct ocfs2_journal *journal,
int *dirty);
void ocfs2_journal_shutdown(struct _ocfs2_super *osb);
-int ocfs2_journal_wipe(ocfs2_journal *journal,
+int ocfs2_journal_wipe(struct ocfs2_journal *journal,
int full);
-int ocfs2_journal_load(ocfs2_journal *journal);
+int ocfs2_journal_load(struct ocfs2_journal *journal);
int ocfs2_check_journals_nolocks(ocfs2_super *osb);
void ocfs2_recovery_thread(struct _ocfs2_super *osb,
int node_num);
@@ -264,13 +262,13 @@
/* You must always start_trans with a number of buffs > 0, but it's
* perfectly legal to go through an entire transaction without having
* dirtied any buffers. */
-ocfs2_journal_handle *ocfs2_alloc_handle(ocfs2_super *osb);
-ocfs2_journal_handle *ocfs2_start_trans(struct _ocfs2_super *osb,
- ocfs2_journal_handle *handle,
- int max_buffs);
-void ocfs2_commit_trans(ocfs2_journal_handle *handle);
-int ocfs2_extend_trans(ocfs2_journal_handle *handle,
- int nblocks);
+struct ocfs2_journal_handle *ocfs2_alloc_handle(ocfs2_super *osb);
+struct ocfs2_journal_handle *ocfs2_start_trans(struct _ocfs2_super *osb,
+ struct ocfs2_journal_handle *handle,
+ int max_buffs);
+void ocfs2_commit_trans(struct ocfs2_journal_handle *handle);
+int ocfs2_extend_trans(struct ocfs2_journal_handle *handle,
+ int nblocks);
/*
* Create access is for when we get a newly created buffer and we're
@@ -287,7 +285,7 @@
#define OCFS2_JOURNAL_ACCESS_WRITE 1
#define OCFS2_JOURNAL_ACCESS_UNDO 2
-int ocfs2_journal_access(ocfs2_journal_handle *handle,
+int ocfs2_journal_access(struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *bh,
int type);
@@ -310,17 +308,17 @@
* <modify the bh>
* ocfs2_journal_dirty(handle, bh);
*/
-int ocfs2_journal_dirty(ocfs2_journal_handle *handle,
+int ocfs2_journal_dirty(struct ocfs2_journal_handle *handle,
struct buffer_head *bh);
int ocfs2_journal_dirty_data(handle_t *handle,
struct buffer_head *bh);
-int ocfs2_handle_add_lock(ocfs2_journal_handle *handle,
+int ocfs2_handle_add_lock(struct ocfs2_journal_handle *handle,
struct inode *inode);
/*
* Use this to protect from other processes reading buffer state while
* it's in flight.
*/
-void ocfs2_handle_add_inode(ocfs2_journal_handle *handle,
+void ocfs2_handle_add_inode(struct ocfs2_journal_handle *handle,
struct inode *inode);
/*
Modified: branches/enotypedefs/fs/ocfs2/localalloc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/localalloc.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/localalloc.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -58,19 +58,19 @@
static void ocfs2_clear_local_alloc(ocfs2_dinode *alloc);
static int ocfs2_sync_local_to_main(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_dinode *alloc,
struct inode *main_bm_inode,
struct buffer_head *main_bm_bh);
static int ocfs2_local_alloc_reserve_for_window(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context **ac,
struct inode **bitmap_inode,
struct buffer_head **bitmap_bh);
static int ocfs2_local_alloc_new_window(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac);
static int ocfs2_local_alloc_slide_window(ocfs2_super *osb,
@@ -196,7 +196,7 @@
void ocfs2_shutdown_local_alloc(ocfs2_super *osb)
{
int status;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
struct inode *local_alloc_inode = NULL;
struct buffer_head *bh = NULL;
struct buffer_head *main_bm_bh = NULL;
@@ -385,7 +385,7 @@
ocfs2_dinode *alloc)
{
int status;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
struct buffer_head *main_bm_bh = NULL;
struct inode *main_bm_inode = NULL;
@@ -452,7 +452,7 @@
* our own in order to shift windows.
*/
int ocfs2_reserve_local_alloc_bits(ocfs2_super *osb,
- ocfs2_journal_handle *passed_handle,
+ struct ocfs2_journal_handle *passed_handle,
u32 bits_wanted,
ocfs2_alloc_context *ac)
{
@@ -529,7 +529,7 @@
}
int ocfs2_claim_local_alloc_bits(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u32 min_bits,
u32 *bit_off,
@@ -707,7 +707,7 @@
* passed is used for caching.
*/
static int ocfs2_sync_local_to_main(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_dinode *alloc,
struct inode *main_bm_inode,
struct buffer_head *main_bm_bh)
@@ -777,7 +777,7 @@
}
static int ocfs2_local_alloc_reserve_for_window(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context **ac,
struct inode **bitmap_inode,
struct buffer_head **bitmap_bh)
@@ -820,7 +820,7 @@
* pass it the bitmap lock in lock_bh if you have it.
*/
static int ocfs2_local_alloc_new_window(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac)
{
int status = 0;
@@ -879,7 +879,7 @@
int status = 0;
struct buffer_head *main_bm_bh = NULL;
struct inode *main_bm_inode = NULL;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
ocfs2_dinode *alloc;
ocfs2_dinode *alloc_copy = NULL;
ocfs2_alloc_context *ac = NULL;
Modified: branches/enotypedefs/fs/ocfs2/localalloc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/localalloc.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/localalloc.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -42,12 +42,12 @@
struct _ocfs2_alloc_context;
int ocfs2_reserve_local_alloc_bits(ocfs2_super *osb,
- ocfs2_journal_handle *passed_handle,
+ struct ocfs2_journal_handle *passed_handle,
u32 bits_wanted,
struct _ocfs2_alloc_context *ac);
int ocfs2_claim_local_alloc_bits(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct _ocfs2_alloc_context *ac,
u32 min_bits,
u32 *bit_off,
Modified: branches/enotypedefs/fs/ocfs2/namei.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/namei.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/namei.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -74,12 +74,13 @@
unsigned long offset,
struct ocfs2_dir_entry **res_dir);
-static int ocfs2_delete_entry(ocfs2_journal_handle *handle,
+static int ocfs2_delete_entry(struct ocfs2_journal_handle *handle,
struct inode *dir,
struct ocfs2_dir_entry *de_del,
struct buffer_head *bh);
-static int __ocfs2_add_entry(ocfs2_journal_handle *handle, struct inode *dir,
+static int __ocfs2_add_entry(struct ocfs2_journal_handle *handle,
+ struct inode *dir,
const char *name, int namelen,
struct inode *inode, u64 blkno,
struct buffer_head *parent_fe_bh,
@@ -90,43 +91,43 @@
dev_t dev,
struct buffer_head **new_fe_bh,
struct buffer_head *parent_fe_bh,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode **ret_inode,
ocfs2_alloc_context *inode_ac);
static int ocfs2_fill_new_dir(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *parent,
struct inode *inode,
struct buffer_head *fe_bh,
ocfs2_alloc_context *data_ac);
static int ocfs2_double_lock(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct buffer_head **bh1,
struct inode *inode1,
struct buffer_head **bh2,
struct inode *inode2);
static int ocfs2_prepare_orphan_dir(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
char *name,
struct buffer_head **de_bh);
static int ocfs2_orphan_add(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
ocfs2_dinode *fe,
char *name,
struct buffer_head *de_bh);
static int ocfs2_create_symlink_data(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
const char *symname);
-static inline int ocfs2_add_entry(ocfs2_journal_handle *handle,
+static inline int ocfs2_add_entry(struct ocfs2_journal_handle *handle,
struct dentry *dentry,
struct inode *inode, u64 blkno,
struct buffer_head *parent_fe_bh,
@@ -216,7 +217,7 @@
}
static int ocfs2_fill_new_dir(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *parent,
struct inode *inode,
struct buffer_head *fe_bh,
@@ -291,7 +292,7 @@
{
int status = 0;
struct buffer_head *parent_fe_bh = NULL;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
ocfs2_super *osb;
ocfs2_dinode *dirfe;
struct buffer_head *new_fe_bh = NULL;
@@ -455,7 +456,7 @@
dev_t dev,
struct buffer_head **new_fe_bh,
struct buffer_head *parent_fe_bh,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode **ret_inode,
ocfs2_alloc_context *inode_ac)
{
@@ -621,7 +622,7 @@
struct inode *dir,
struct dentry *dentry)
{
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
struct inode *inode = old_dentry->d_inode;
int err;
struct buffer_head *fe_bh = NULL;
@@ -751,7 +752,7 @@
ocfs2_dinode *fe = NULL;
struct buffer_head *fe_bh = NULL;
struct buffer_head *parent_node_bh = NULL;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
struct ocfs2_dir_entry *dirent = NULL;
struct buffer_head *dirent_bh = NULL;
char orphan_name[OCFS2_ORPHAN_NAMELEN + 1];
@@ -931,7 +932,7 @@
* if they have the same id, then the 1st one is the only one locked.
*/
static int ocfs2_double_lock(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct buffer_head **bh1,
struct inode *inode1,
struct buffer_head **bh2,
@@ -1006,7 +1007,7 @@
struct buffer_head *insert_entry_bh = NULL;
ocfs2_super *osb = NULL;
u64 newfe_blkno;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
struct buffer_head *old_dir_bh = NULL;
struct buffer_head *new_dir_bh = NULL;
struct ocfs2_dir_entry *old_de = NULL, *new_de = NULL; // dirent for old_dentry
@@ -1424,7 +1425,7 @@
* data, including the null terminator.
*/
static int ocfs2_create_symlink_data(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
const char *symname)
{
@@ -1538,7 +1539,7 @@
struct buffer_head *parent_fe_bh = NULL;
ocfs2_dinode *fe = NULL;
ocfs2_dinode *dirfe;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
ocfs2_alloc_context *inode_ac = NULL;
ocfs2_alloc_context *data_ac = NULL;
@@ -1726,7 +1727,8 @@
* If you pass me insert_bh, I'll skip the search of the other dir
* blocks and put the record in there.
*/
-static int __ocfs2_add_entry(ocfs2_journal_handle *handle, struct inode *dir,
+static int __ocfs2_add_entry(struct ocfs2_journal_handle *handle,
+ struct inode *dir,
const char *name, int namelen,
struct inode *inode, u64 blkno,
struct buffer_head *parent_fe_bh,
@@ -1811,7 +1813,7 @@
* ocfs2_delete_entry deletes a directory entry by merging it with the
* previous entry
*/
-static int ocfs2_delete_entry(ocfs2_journal_handle *handle,
+static int ocfs2_delete_entry(struct ocfs2_journal_handle *handle,
struct inode *dir,
struct ocfs2_dir_entry *de_del,
struct buffer_head *bh)
@@ -2043,7 +2045,7 @@
}
static int ocfs2_prepare_orphan_dir(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
char *name,
struct buffer_head **de_bh)
@@ -2094,7 +2096,7 @@
}
static int ocfs2_orphan_add(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *inode,
ocfs2_dinode *fe,
char *name,
@@ -2179,7 +2181,7 @@
/* unlike orphan_add, we expect the orphan dir to already be locked here. */
int ocfs2_orphan_del(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *orphan_dir_inode,
struct inode *inode,
struct buffer_head *orphan_dir_bh)
Modified: branches/enotypedefs/fs/ocfs2/namei.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/namei.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/namei.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -39,7 +39,7 @@
struct inode *dir,
struct ocfs2_dir_entry **res_dir);
int ocfs2_orphan_del(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
struct inode *orphan_dir_inode,
struct inode *inode,
struct buffer_head *orphan_dir_bh);
Modified: branches/enotypedefs/fs/ocfs2/ocfs2.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/ocfs2.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/ocfs2.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -173,9 +173,8 @@
#define OCFS2_OSB_HARD_RO 0x0002
#define OCFS2_OSB_ERROR_FS 0x0004
-struct _ocfs2_journal;
-typedef struct _ocfs2_journal_handle ocfs2_journal_handle;
-
+struct ocfs2_journal;
+struct ocfs2_journal_handle;
typedef struct _ocfs2_super
{
u32 osb_id; /* id used by the proc interface */
@@ -230,7 +229,7 @@
int disable_recovery;
wait_queue_head_t checkpoint_event;
atomic_t needs_checkpoint;
- struct _ocfs2_journal *journal;
+ struct ocfs2_journal *journal;
enum ocfs2_local_alloc_state local_alloc_state;
struct buffer_head *local_alloc_bh;
Modified: branches/enotypedefs/fs/ocfs2/suballoc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/suballoc.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/suballoc.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -49,7 +49,7 @@
static inline void ocfs2_debug_bg(ocfs2_group_desc *bg);
static inline void ocfs2_debug_suballoc_inode(ocfs2_dinode *fe);
static inline u16 ocfs2_find_victim_chain(ocfs2_chain_list *cl);
-static int ocfs2_block_group_fill(ocfs2_journal_handle *handle,
+static int ocfs2_block_group_fill(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *bg_bh,
u64 group_blkno,
@@ -90,20 +90,20 @@
unsigned int bits_wanted,
u16 *bit_off,
u16 *bits_found);
-static inline int ocfs2_block_group_set_bits(ocfs2_journal_handle *handle,
+static inline int ocfs2_block_group_set_bits(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
ocfs2_group_desc *bg,
struct buffer_head *group_bh,
unsigned int bit_off,
unsigned int num_bits);
-static inline int ocfs2_block_group_clear_bits(ocfs2_journal_handle *handle,
+static inline int ocfs2_block_group_clear_bits(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
ocfs2_group_desc *bg,
struct buffer_head *group_bh,
unsigned int bit_off,
unsigned int num_bits);
-static int ocfs2_relink_block_group(ocfs2_journal_handle *handle,
+static int ocfs2_relink_block_group(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *fe_bh,
struct buffer_head *bg_bh,
@@ -111,7 +111,7 @@
u16 chain);
static inline int ocfs2_block_group_reasonably_empty(ocfs2_group_desc *bg,
u32 wanted);
-static int ocfs2_free_suballoc_bits(ocfs2_journal_handle *handle,
+static int ocfs2_free_suballoc_bits(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *alloc_bh,
unsigned int start_bit,
@@ -143,7 +143,7 @@
return (u32)le16_to_cpu(cl->cl_cpg) * (u32)le16_to_cpu(cl->cl_bpc);
}
-static int ocfs2_block_group_fill(ocfs2_journal_handle *handle,
+static int ocfs2_block_group_fill(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *bg_bh,
u64 group_blkno,
@@ -225,7 +225,7 @@
ocfs2_dinode *fe = (ocfs2_dinode *) bh->b_data;
ocfs2_chain_list *cl;
ocfs2_alloc_context *ac = NULL;
- ocfs2_journal_handle *handle = NULL;
+ struct ocfs2_journal_handle *handle = NULL;
u32 bit_off, num_bits;
u16 alloc_rec;
u64 bg_blkno;
@@ -360,7 +360,7 @@
u32 bits_wanted = ac->ac_bits_wanted;
struct inode *alloc_inode = ac->ac_inode;
struct buffer_head *bh = NULL;
- ocfs2_journal_handle *handle = ac->ac_handle;
+ struct ocfs2_journal_handle *handle = ac->ac_handle;
ocfs2_dinode *fe;
u32 free_bits;
@@ -425,7 +425,7 @@
}
int ocfs2_reserve_new_metadata(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_dinode *fe,
ocfs2_alloc_context **ac)
{
@@ -483,7 +483,7 @@
}
int ocfs2_reserve_new_inode(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context **ac)
{
int status;
@@ -562,7 +562,7 @@
* use so we figure it out for them, but unfortunately this clutters
* things a bit. */
int ocfs2_reserve_clusters(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
u32 bits_wanted,
ocfs2_alloc_context **ac)
{
@@ -727,7 +727,7 @@
return status;
}
-static inline int ocfs2_block_group_set_bits(ocfs2_journal_handle *handle,
+static inline int ocfs2_block_group_set_bits(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
ocfs2_group_desc *bg,
struct buffer_head *group_bh,
@@ -798,7 +798,7 @@
return best;
}
-static int ocfs2_relink_block_group(ocfs2_journal_handle *handle,
+static int ocfs2_relink_block_group(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *fe_bh,
struct buffer_head *bg_bh,
@@ -965,7 +965,7 @@
u16 chain, tmp_bits;
u32 tmp_used;
u64 next_group;
- ocfs2_journal_handle *handle = ac->ac_handle;
+ struct ocfs2_journal_handle *handle = ac->ac_handle;
struct inode *alloc_inode = ac->ac_inode;
struct buffer_head *group_bh = NULL;
struct buffer_head *prev_group_bh = NULL;
@@ -1190,7 +1190,7 @@
}
int ocfs2_claim_metadata(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u32 bits_wanted,
u16 *suballoc_bit_start,
@@ -1227,7 +1227,7 @@
}
int ocfs2_claim_new_inode(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u16 *suballoc_bit,
u64 *fe_blkno)
@@ -1330,7 +1330,7 @@
* of any size.
*/
int ocfs2_claim_clusters(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u32 min_clusters,
u32 *cluster_start,
@@ -1400,7 +1400,7 @@
return status;
}
-static inline int ocfs2_block_group_clear_bits(ocfs2_journal_handle *handle,
+static inline int ocfs2_block_group_clear_bits(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
ocfs2_group_desc *bg,
struct buffer_head *group_bh,
@@ -1455,7 +1455,7 @@
/*
* expects the suballoc inode to already be locked.
*/
-static int ocfs2_free_suballoc_bits(ocfs2_journal_handle *handle,
+static int ocfs2_free_suballoc_bits(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *alloc_bh,
unsigned int start_bit,
@@ -1540,7 +1540,7 @@
return group;
}
-int ocfs2_free_dinode(ocfs2_journal_handle *handle,
+int ocfs2_free_dinode(struct ocfs2_journal_handle *handle,
struct inode *inode_alloc_inode,
struct buffer_head *inode_alloc_bh,
ocfs2_dinode *di)
@@ -1553,7 +1553,7 @@
inode_alloc_bh, bit, bg_blkno, 1);
}
-int ocfs2_free_extent_block(ocfs2_journal_handle *handle,
+int ocfs2_free_extent_block(struct ocfs2_journal_handle *handle,
struct inode *eb_alloc_inode,
struct buffer_head *eb_alloc_bh,
ocfs2_extent_block *eb)
@@ -1566,7 +1566,7 @@
bit, bg_blkno, 1);
}
-int ocfs2_free_clusters(ocfs2_journal_handle *handle,
+int ocfs2_free_clusters(struct ocfs2_journal_handle *handle,
struct inode *bitmap_inode,
struct buffer_head *bitmap_bh,
u64 start_blk,
Modified: branches/enotypedefs/fs/ocfs2/suballoc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/suballoc.h 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/suballoc.h 2005-11-08 20:55:17 UTC (rev 2680)
@@ -43,7 +43,7 @@
#define OCFS2_AC_USE_INODE 3
#define OCFS2_AC_USE_META 4
u32 ac_which;
- ocfs2_journal_handle *ac_handle;
+ struct ocfs2_journal_handle *ac_handle;
/* these are used by the chain search */
u16 ac_chain;
@@ -58,45 +58,45 @@
}
int ocfs2_reserve_new_metadata(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_dinode *fe,
ocfs2_alloc_context **ac);
int ocfs2_reserve_new_inode(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context **ac);
int ocfs2_reserve_clusters(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
u32 bits_wanted,
ocfs2_alloc_context **ac);
int ocfs2_claim_metadata(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u32 bits_wanted,
u16 *suballoc_bit_start,
u32 *num_bits,
u64 *blkno_start);
int ocfs2_claim_new_inode(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u16 *suballoc_bit,
u64 *fe_blkno);
int ocfs2_claim_clusters(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ struct ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u32 min_clusters,
u32 *cluster_start,
u32 *num_clusters);
-int ocfs2_free_dinode(ocfs2_journal_handle *handle,
+int ocfs2_free_dinode(struct ocfs2_journal_handle *handle,
struct inode *inode_alloc_inode,
struct buffer_head *inode_alloc_bh,
ocfs2_dinode *di);
-int ocfs2_free_extent_block(ocfs2_journal_handle *handle,
+int ocfs2_free_extent_block(struct ocfs2_journal_handle *handle,
struct inode *eb_alloc_inode,
struct buffer_head *eb_alloc_bh,
ocfs2_extent_block *eb);
-int ocfs2_free_clusters(ocfs2_journal_handle *handle,
+int ocfs2_free_clusters(struct ocfs2_journal_handle *handle,
struct inode *bitmap_inode,
struct buffer_head *bitmap_bh,
u64 start_blk,
Modified: branches/enotypedefs/fs/ocfs2/super.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/super.c 2005-11-08 20:54:47 UTC (rev 2679)
+++ branches/enotypedefs/fs/ocfs2/super.c 2005-11-08 20:55:17 UTC (rev 2680)
@@ -969,7 +969,8 @@
return -ENOMEM;
ocfs2_lock_cache = kmem_cache_create("ocfs2_lock",
- sizeof(ocfs2_journal_lock), 0,
+ sizeof(struct ocfs2_journal_lock),
+ 0,
SLAB_NO_REAP|SLAB_HWCACHE_ALIGN,
NULL, NULL);
if (!ocfs2_lock_cache)
@@ -1240,7 +1241,7 @@
ocfs2_dinode *di = NULL;
struct inode *inode = NULL;
struct buffer_head *bitmap_bh = NULL;
- ocfs2_journal *journal;
+ struct ocfs2_journal *journal;
__le32 uuid_net_key;
ocfs2_super *osb;
@@ -1367,7 +1368,7 @@
*/
/* initialize our journal structure */
- journal = kcalloc(1, sizeof(ocfs2_journal), GFP_KERNEL);
+ journal = kcalloc(1, sizeof(struct ocfs2_journal), GFP_KERNEL);
if (!journal) {
mlog(ML_ERROR, "unable to alloc journal\n");
status = -ENOMEM;
More information about the Ocfs2-commits
mailing list