[Ocfs2-commits] jlbec commits r2685 - branches/enotypedefs/fs/ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Nov 8 16:27:23 CST 2005
Author: jlbec
Date: 2005-11-08 16:27:18 -0600 (Tue, 08 Nov 2005)
New Revision: 2685
Modified:
branches/enotypedefs/fs/ocfs2/alloc.c
branches/enotypedefs/fs/ocfs2/alloc.h
branches/enotypedefs/fs/ocfs2/aops.c
branches/enotypedefs/fs/ocfs2/buffer_head_io.c
branches/enotypedefs/fs/ocfs2/buffer_head_io.h
branches/enotypedefs/fs/ocfs2/dcache.c
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/heartbeat.c
branches/enotypedefs/fs/ocfs2/heartbeat.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/slot_map.c
branches/enotypedefs/fs/ocfs2/slot_map.h
branches/enotypedefs/fs/ocfs2/suballoc.c
branches/enotypedefs/fs/ocfs2/suballoc.h
branches/enotypedefs/fs/ocfs2/super.c
branches/enotypedefs/fs/ocfs2/super.h
branches/enotypedefs/fs/ocfs2/symlink.c
branches/enotypedefs/fs/ocfs2/sysfile.c
branches/enotypedefs/fs/ocfs2/sysfile.h
branches/enotypedefs/fs/ocfs2/vote.c
branches/enotypedefs/fs/ocfs2/vote.h
Log:
o Remove the ocfs2_super typedef
Modified: branches/enotypedefs/fs/ocfs2/alloc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/alloc.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/alloc.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -51,14 +51,14 @@
struct ocfs2_extent_rec *ext,
u64 blkno);
-static int ocfs2_create_new_meta_bhs(ocfs2_super *osb,
+static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
int wanted,
struct ocfs2_alloc_context *meta_ac,
struct buffer_head *bhs[]);
-static int ocfs2_add_branch(ocfs2_super *osb,
+static int ocfs2_add_branch(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
@@ -66,26 +66,26 @@
struct buffer_head *last_eb_bh,
struct ocfs2_alloc_context *meta_ac);
-static int ocfs2_shift_tree_depth(ocfs2_super *osb,
+static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
struct ocfs2_alloc_context *meta_ac,
struct buffer_head **ret_new_eb_bh);
-static int ocfs2_do_insert_extent(ocfs2_super *osb,
+static int ocfs2_do_insert_extent(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
u64 blkno,
u32 new_clusters);
-static int ocfs2_find_branch_target(ocfs2_super *osb,
+static int ocfs2_find_branch_target(struct ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh,
struct buffer_head **target_bh);
-static int ocfs2_find_new_last_ext_blk(ocfs2_super *osb,
+static int ocfs2_find_new_last_ext_blk(struct ocfs2_super *osb,
struct inode *inode,
struct ocfs2_dinode *fe,
unsigned int new_i_clusters,
@@ -106,7 +106,7 @@
/*
* How many free extents have we got before we need more meta data?
*/
-int ocfs2_num_free_extents(ocfs2_super *osb,
+int ocfs2_num_free_extents(struct ocfs2_super *osb,
struct inode *inode,
struct ocfs2_dinode *fe)
{
@@ -151,7 +151,7 @@
* sets h_signature, h_blkno, h_suballoc_bit, h_suballoc_slot, and
* l_count for you
*/
-static int ocfs2_create_new_meta_bhs(ocfs2_super *osb,
+static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
int wanted,
@@ -252,7 +252,7 @@
* the new branch will be 'empty' in the sense that every block will
* contain a single record with e_clusters == 0.
*/
-static int ocfs2_add_branch(ocfs2_super *osb,
+static int ocfs2_add_branch(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
@@ -417,7 +417,7 @@
* returns back the new extent block so you can add a branch to it
* after this call.
*/
-static int ocfs2_shift_tree_depth(ocfs2_super *osb,
+static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
@@ -519,7 +519,7 @@
* extent. Updates all the extent blocks (and the dinode) on the way
* down.
*/
-static int ocfs2_do_insert_extent(ocfs2_super *osb,
+static int ocfs2_do_insert_extent(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
@@ -725,7 +725,7 @@
*
* return status < 0 indicates an error.
*/
-static int ocfs2_find_branch_target(ocfs2_super *osb,
+static int ocfs2_find_branch_target(struct ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh,
struct buffer_head **target_bh)
@@ -809,7 +809,7 @@
}
/* the caller needs to update fe->i_clusters */
-int ocfs2_insert_extent(ocfs2_super *osb,
+int ocfs2_insert_extent(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
@@ -918,7 +918,7 @@
return status;
}
-static inline int ocfs2_truncate_log_needs_flush(ocfs2_super *osb)
+static inline int ocfs2_truncate_log_needs_flush(struct ocfs2_super *osb)
{
struct buffer_head *tl_bh = osb->osb_tl_bh;
struct ocfs2_dinode *di;
@@ -951,7 +951,7 @@
return current_tail == new_start;
}
-static int ocfs2_truncate_log_append(ocfs2_super *osb,
+static int ocfs2_truncate_log_append(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
u64 start_blk,
unsigned int num_clusters)
@@ -1033,7 +1033,7 @@
return status;
}
-static int ocfs2_replay_truncate_records(ocfs2_super *osb,
+static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *data_alloc_inode,
struct buffer_head *data_alloc_bh)
@@ -1109,7 +1109,7 @@
}
/* Expects you to already be holding tl_inode->i_sem */
-static int __ocfs2_flush_truncate_log(ocfs2_super *osb)
+static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
{
int status;
unsigned int num_to_flush;
@@ -1193,7 +1193,7 @@
return status;
}
-int ocfs2_flush_truncate_log(ocfs2_super *osb)
+int ocfs2_flush_truncate_log(struct ocfs2_super *osb)
{
int status;
struct inode *tl_inode = osb->osb_tl_inode;
@@ -1208,7 +1208,7 @@
static void ocfs2_truncate_log_worker(void *data)
{
int status;
- ocfs2_super *osb = data;
+ struct ocfs2_super *osb = data;
mlog_entry_void();
@@ -1220,7 +1220,7 @@
}
#define OCFS2_TRUNCATE_LOG_FLUSH_INTERVAL (2 * HZ)
-void ocfs2_schedule_truncate_log_flush(ocfs2_super *osb,
+void ocfs2_schedule_truncate_log_flush(struct ocfs2_super *osb,
int cancel)
{
if (osb->osb_tl_inode) {
@@ -1234,7 +1234,7 @@
}
}
-static int ocfs2_get_truncate_log_info(ocfs2_super *osb,
+static int ocfs2_get_truncate_log_info(struct ocfs2_super *osb,
int slot_num,
struct inode **tl_inode,
struct buffer_head **tl_bh)
@@ -1271,7 +1271,7 @@
* truncate log and pass back a copy for processing later. if the
* truncate log does not require processing, a *tl_copy is set to
* NULL. */
-int ocfs2_begin_truncate_log_recovery(ocfs2_super *osb,
+int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb,
int slot_num,
struct ocfs2_dinode **tl_copy)
{
@@ -1340,7 +1340,7 @@
return status;
}
-int ocfs2_complete_truncate_log_recovery(ocfs2_super *osb,
+int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,
struct ocfs2_dinode *tl_copy)
{
int status = 0;
@@ -1401,7 +1401,7 @@
return status;
}
-void ocfs2_truncate_log_shutdown(ocfs2_super *osb)
+void ocfs2_truncate_log_shutdown(struct ocfs2_super *osb)
{
int status;
struct inode *tl_inode = osb->osb_tl_inode;
@@ -1423,7 +1423,7 @@
mlog_exit_void();
}
-int ocfs2_truncate_log_init(ocfs2_super *osb)
+int ocfs2_truncate_log_init(struct ocfs2_super *osb)
{
int status;
struct inode *tl_inode = NULL;
@@ -1453,12 +1453,12 @@
* block will be deleted, and if it will, what the new last extent
* block will be so we can update his h_next_leaf_blk field, as well
* as the dinodes i_last_eb_blk */
-static int ocfs2_find_new_last_ext_blk(ocfs2_super *osb,
- struct inode *inode,
- struct ocfs2_dinode *fe,
- u32 new_i_clusters,
- struct buffer_head *old_last_eb,
- struct buffer_head **new_last_eb)
+static int ocfs2_find_new_last_ext_blk(struct ocfs2_super *osb,
+ struct inode *inode,
+ struct ocfs2_dinode *fe,
+ u32 new_i_clusters,
+ struct buffer_head *old_last_eb,
+ struct buffer_head **new_last_eb)
{
int i, status = 0;
u64 block = 0;
@@ -1537,13 +1537,13 @@
return status;
}
-static int ocfs2_do_truncate(ocfs2_super *osb,
- unsigned int clusters_to_del,
- struct inode *inode,
- struct buffer_head *fe_bh,
- struct buffer_head *old_last_eb_bh,
- struct ocfs2_journal_handle *handle,
- struct ocfs2_truncate_context *tc)
+static int ocfs2_do_truncate(struct ocfs2_super *osb,
+ unsigned int clusters_to_del,
+ struct inode *inode,
+ struct buffer_head *fe_bh,
+ struct buffer_head *old_last_eb_bh,
+ struct ocfs2_journal_handle *handle,
+ struct ocfs2_truncate_context *tc)
{
int status, i, depth;
struct ocfs2_dinode *fe;
@@ -1757,7 +1757,7 @@
*
* WARNING: This will kfree the truncate context
*/
-int ocfs2_commit_truncate(ocfs2_super *osb,
+int ocfs2_commit_truncate(struct ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh,
struct ocfs2_truncate_context *tc)
@@ -1911,7 +1911,7 @@
* inodes need to be locked and will put them on the returned truncate
* context.
*/
-int ocfs2_prepare_truncate(ocfs2_super *osb,
+int ocfs2_prepare_truncate(struct ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh,
struct ocfs2_truncate_context **tc)
Modified: branches/enotypedefs/fs/ocfs2/alloc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/alloc.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/alloc.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -27,14 +27,14 @@
#define OCFS2_ALLOC_H
struct ocfs2_alloc_context;
-int ocfs2_insert_extent(ocfs2_super *osb,
+int ocfs2_insert_extent(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
u64 blkno,
u32 new_clusters,
struct ocfs2_alloc_context *meta_ac);
-int ocfs2_num_free_extents(ocfs2_super *osb,
+int ocfs2_num_free_extents(struct ocfs2_super *osb,
struct inode *inode,
struct ocfs2_dinode *fe);
/* how many new metadata chunks would an allocation need at maximum? */
@@ -51,15 +51,15 @@
return le16_to_cpu(fe->id2.i_list.l_tree_depth) + 2;
}
-int ocfs2_truncate_log_init(ocfs2_super *osb);
-void ocfs2_truncate_log_shutdown(ocfs2_super *osb);
-void ocfs2_schedule_truncate_log_flush(ocfs2_super *osb,
+int ocfs2_truncate_log_init(struct ocfs2_super *osb);
+void ocfs2_truncate_log_shutdown(struct ocfs2_super *osb);
+void ocfs2_schedule_truncate_log_flush(struct ocfs2_super *osb,
int cancel);
-int ocfs2_flush_truncate_log(ocfs2_super *osb);
-int ocfs2_begin_truncate_log_recovery(ocfs2_super *osb,
+int ocfs2_flush_truncate_log(struct ocfs2_super *osb);
+int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb,
int slot_num,
struct ocfs2_dinode **tl_copy);
-int ocfs2_complete_truncate_log_recovery(ocfs2_super *osb,
+int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,
struct ocfs2_dinode *tl_copy);
struct ocfs2_truncate_context {
@@ -70,11 +70,11 @@
struct buffer_head *tc_last_eb_bh;
};
-int ocfs2_prepare_truncate(ocfs2_super *osb,
+int ocfs2_prepare_truncate(struct ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh,
struct ocfs2_truncate_context **tc);
-int ocfs2_commit_truncate(ocfs2_super *osb,
+int ocfs2_commit_truncate(struct ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh,
struct ocfs2_truncate_context *tc);
Modified: branches/enotypedefs/fs/ocfs2/aops.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/aops.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/aops.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -50,7 +50,7 @@
struct ocfs2_dinode *fe = NULL;
struct buffer_head *bh = NULL;
struct buffer_head *buffer_cache_bh = NULL;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
void *kaddr;
mlog_entry("(0x%p, %llu, 0x%p, %d)\n", inode,
@@ -346,7 +346,7 @@
unsigned from,
unsigned to)
{
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_journal_handle *handle = NULL;
int ret = 0;
Modified: branches/enotypedefs/fs/ocfs2/buffer_head_io.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/buffer_head_io.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/buffer_head_io.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -39,7 +39,7 @@
#include "buffer_head_io.h"
-int ocfs2_write_block(ocfs2_super *osb, struct buffer_head *bh,
+int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
struct inode *inode)
{
int ret = 0;
@@ -88,7 +88,7 @@
return ret;
}
-int ocfs2_read_blocks(ocfs2_super *osb, u64 block, int nr,
+int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
struct buffer_head *bhs[], int flags,
struct inode *inode)
{
Modified: branches/enotypedefs/fs/ocfs2/buffer_head_io.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/buffer_head_io.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/buffer_head_io.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -31,16 +31,16 @@
void ocfs2_end_buffer_io_sync(struct buffer_head *bh,
int uptodate);
-static inline int ocfs2_read_block(ocfs2_super *osb,
+static inline int ocfs2_read_block(struct ocfs2_super *osb,
u64 off,
struct buffer_head **bh,
int flags,
struct inode *inode);
-int ocfs2_write_block(ocfs2_super *osb,
+int ocfs2_write_block(struct ocfs2_super *osb,
struct buffer_head *bh,
struct inode *inode);
-int ocfs2_read_blocks(ocfs2_super *osb,
+int ocfs2_read_blocks(struct ocfs2_super *osb,
u64 block,
int nr,
struct buffer_head *bhs[],
@@ -51,7 +51,7 @@
#define OCFS2_BH_CACHED 1
#define OCFS2_BH_READAHEAD 8 /* use this to pass READA down to submit_bh */
-static inline int ocfs2_read_block(ocfs2_super * osb, u64 off,
+static inline int ocfs2_read_block(struct ocfs2_super * osb, u64 off,
struct buffer_head **bh, int flags,
struct inode *inode)
{
Modified: branches/enotypedefs/fs/ocfs2/dcache.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dcache.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/dcache.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -43,7 +43,7 @@
{
struct inode *inode = dentry->d_inode;
int ret = 0; /* if all else fails, just return false */
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
mlog_entry("(0x%p, '%.*s')\n", dentry,
dentry->d_name.len, dentry->d_name.name);
Modified: branches/enotypedefs/fs/ocfs2/dir.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dir.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/dir.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -63,10 +63,10 @@
DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK
};
-static int ocfs2_extend_dir(ocfs2_super *osb,
- struct inode *dir,
- struct buffer_head *parent_fe_bh,
- struct buffer_head **new_de_bh);
+static int ocfs2_extend_dir(struct ocfs2_super *osb,
+ struct inode *dir,
+ struct buffer_head *parent_fe_bh,
+ struct buffer_head **new_de_bh);
/*
* ocfs2_readdir()
*
@@ -212,7 +212,7 @@
struct ocfs2_dir_entry **dirent)
{
int status = -ENOENT;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
mlog_entry("(osb=%p, parent=%"MLFu64", name='%.*s', blkno=%p, "
"inode=%p)\n",
@@ -387,7 +387,7 @@
}
/* assumes you already have a cluster lock on the directory. */
-static int ocfs2_extend_dir(ocfs2_super *osb,
+static int ocfs2_extend_dir(struct ocfs2_super *osb,
struct inode *dir,
struct buffer_head *parent_fe_bh,
struct buffer_head **new_de_bh)
@@ -514,7 +514,7 @@
* Search the dir for a good spot, extending it if necessary. The
* block containing an appropriate record is returned in ret_de_bh.
*/
-int ocfs2_prepare_dir_for_insert(ocfs2_super *osb,
+int ocfs2_prepare_dir_for_insert(struct ocfs2_super *osb,
struct inode *dir,
struct buffer_head *parent_fe_bh,
const char *name,
Modified: branches/enotypedefs/fs/ocfs2/dir.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/dir.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/dir.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -37,7 +37,7 @@
struct buffer_head **dirent_bh,
struct ocfs2_dir_entry **dirent);
int ocfs2_readdir(struct file *filp, void *dirent, filldir_t filldir);
-int ocfs2_prepare_dir_for_insert(ocfs2_super *osb,
+int ocfs2_prepare_dir_for_insert(struct ocfs2_super *osb,
struct inode *dir,
struct buffer_head *parent_fe_bh,
const char *name,
Modified: branches/enotypedefs/fs/ocfs2/dlmglue.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlmglue.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/dlmglue.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -88,7 +88,7 @@
static int ocfs2_unblock_osb_lock(struct ocfs2_lock_res *lockres,
int *requeue);
typedef void (ocfs2_convert_worker_t)(struct ocfs2_lock_res *, int);
-static int ocfs2_generic_unblock_lock(ocfs2_super *osb,
+static int ocfs2_generic_unblock_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
int *requeue,
ocfs2_convert_worker_t *worker);
@@ -155,12 +155,12 @@
return lockres->l_type == OCFS2_LOCK_TYPE_RENAME;
}
-static inline ocfs2_super *ocfs2_lock_res_super(struct ocfs2_lock_res *lockres)
+static inline struct ocfs2_super *ocfs2_lock_res_super(struct ocfs2_lock_res *lockres)
{
BUG_ON(!ocfs2_is_super_lock(lockres)
&& !ocfs2_is_rename_lock(lockres));
- return (ocfs2_super *) lockres->l_priv;
+ return (struct ocfs2_super *) lockres->l_priv;
}
static inline struct inode *ocfs2_lock_res_inode(struct ocfs2_lock_res *lockres)
@@ -170,20 +170,20 @@
return (struct inode *) lockres->l_priv;
}
-static int ocfs2_lock_create(ocfs2_super *osb,
+static int ocfs2_lock_create(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
int level,
int dlm_flags);
static inline int ocfs2_may_continue_on_blocked_lock(struct ocfs2_lock_res *lockres,
int wanted);
-static void ocfs2_cluster_unlock(ocfs2_super *osb,
+static void ocfs2_cluster_unlock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
int level);
static inline void ocfs2_generic_handle_downconvert_action(struct ocfs2_lock_res *lockres);
static inline void ocfs2_generic_handle_convert_action(struct ocfs2_lock_res *lockres);
static inline void ocfs2_generic_handle_attach_action(struct ocfs2_lock_res *lockres);
static int ocfs2_generic_handle_bast(struct ocfs2_lock_res *lockres, int level);
-static void ocfs2_schedule_blocked_lock(ocfs2_super *osb,
+static void ocfs2_schedule_blocked_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres);
static inline void ocfs2_recover_from_dlm_error(struct ocfs2_lock_res *lockres,
int convert);
@@ -192,11 +192,11 @@
"resource %s: %s\n", dlm_errname(_stat), _func, \
_lockres->l_name, dlm_errmsg(_stat)); \
} while (0)
-static void ocfs2_vote_on_unlock(ocfs2_super *osb,
+static void ocfs2_vote_on_unlock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres);
static int ocfs2_meta_lock_update(struct inode *inode,
struct buffer_head **bh);
-static void ocfs2_drop_osb_locks(ocfs2_super *osb);
+static void ocfs2_drop_osb_locks(struct ocfs2_super *osb);
static inline int ocfs2_highest_compat_lock_level(int level);
static inline int ocfs2_can_downconvert_meta_lock(struct inode *inode,
struct ocfs2_lock_res *lockres,
@@ -299,7 +299,7 @@
}
static void ocfs2_super_lock_res_init(struct ocfs2_lock_res *res,
- ocfs2_super *osb)
+ struct ocfs2_super *osb)
{
/* Superblock lockres doesn't come from a slab so we call init
* once on it manually. */
@@ -310,7 +310,7 @@
}
static void ocfs2_rename_lock_res_init(struct ocfs2_lock_res *res,
- ocfs2_super *osb)
+ struct ocfs2_super *osb)
{
/* Rename lockres doesn't come from a slab so we call init
* once on it manually. */
@@ -582,7 +582,7 @@
return needs_downconvert;
}
-static void ocfs2_generic_bast_func(ocfs2_super *osb,
+static void ocfs2_generic_bast_func(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
int level)
{
@@ -609,7 +609,7 @@
{
struct ocfs2_lock_res *lockres = opaque;
struct inode *inode;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
mlog_entry_void();
@@ -685,7 +685,7 @@
int level)
{
struct ocfs2_lock_res *lockres = opaque;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
mlog_entry_void();
mlog(0, "Superblock BAST fired\n");
@@ -716,7 +716,7 @@
int level)
{
struct ocfs2_lock_res *lockres = opaque;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
mlog_entry_void();
@@ -752,7 +752,7 @@
* OCFS2_LOCK_BUSY), we'll bail out returning 0. It's up to the caller
* to do the right thing in that case.
*/
-static int ocfs2_lock_create(ocfs2_super *osb,
+static int ocfs2_lock_create(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
int level,
int dlm_flags)
@@ -887,7 +887,7 @@
}
-static int ocfs2_cluster_lock(ocfs2_super *osb,
+static int ocfs2_cluster_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
int level,
int lkm_flags,
@@ -1033,7 +1033,7 @@
return ret;
}
-static void ocfs2_cluster_unlock(ocfs2_super *osb,
+static void ocfs2_cluster_unlock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
int level)
{
@@ -1050,7 +1050,7 @@
static int ocfs2_create_new_inode_lock(struct inode *inode,
struct ocfs2_lock_res *lockres)
{
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
unsigned long flags;
spin_lock_irqsave(&lockres->l_lock, flags);
@@ -1211,7 +1211,7 @@
return ret;
}
-static void ocfs2_vote_on_unlock(ocfs2_super *osb,
+static void ocfs2_vote_on_unlock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres)
{
int kick = 0;
@@ -1561,7 +1561,7 @@
{
int status, level, dlm_flags, acquired;
struct ocfs2_lock_res *lockres;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct buffer_head *local_bh = NULL;
BUG_ON(!inode);
@@ -1713,7 +1713,7 @@
mlog_exit_void();
}
-int ocfs2_super_lock(ocfs2_super *osb,
+int ocfs2_super_lock(struct ocfs2_super *osb,
int ex)
{
int status;
@@ -1759,7 +1759,7 @@
return status;
}
-void ocfs2_super_unlock(ocfs2_super *osb,
+void ocfs2_super_unlock(struct ocfs2_super *osb,
int ex)
{
int level = ex ? LKM_EXMODE : LKM_PRMODE;
@@ -1768,7 +1768,7 @@
ocfs2_cluster_unlock(osb, lockres, level);
}
-int ocfs2_rename_lock(ocfs2_super *osb)
+int ocfs2_rename_lock(struct ocfs2_super *osb)
{
int status;
struct ocfs2_lock_res *lockres = &osb->osb_rename_lockres;
@@ -1783,14 +1783,14 @@
return status;
}
-void ocfs2_rename_unlock(ocfs2_super *osb)
+void ocfs2_rename_unlock(struct ocfs2_super *osb)
{
struct ocfs2_lock_res *lockres = &osb->osb_rename_lockres;
ocfs2_cluster_unlock(osb, lockres, LKM_EXMODE);
}
-int ocfs2_dlm_init(ocfs2_super *osb)
+int ocfs2_dlm_init(struct ocfs2_super *osb)
{
int status;
u32 dlm_key;
@@ -1834,7 +1834,7 @@
return status;
}
-void ocfs2_dlm_shutdown(ocfs2_super *osb)
+void ocfs2_dlm_shutdown(struct ocfs2_super *osb)
{
mlog_entry_void();
@@ -1919,7 +1919,7 @@
void *drop_data;
};
-static int ocfs2_drop_lock(ocfs2_super *osb,
+static int ocfs2_drop_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
struct drop_lock_cb *dcb)
{
@@ -2027,7 +2027,7 @@
spin_unlock_irqrestore(&lockres->l_lock, flags);
}
-static void ocfs2_drop_osb_locks(ocfs2_super *osb)
+static void ocfs2_drop_osb_locks(struct ocfs2_super *osb)
{
int status;
@@ -2119,7 +2119,7 @@
lockres_or_flags(lockres, OCFS2_LOCK_BUSY);
}
-static int ocfs2_downconvert_lock(ocfs2_super *osb,
+static int ocfs2_downconvert_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
int new_level,
int lvb)
@@ -2154,7 +2154,7 @@
}
/* returns 1 when the caller should unlock and call dlmunlock */
-static int ocfs2_prepare_cancel_convert(ocfs2_super *osb,
+static int ocfs2_prepare_cancel_convert(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres)
{
assert_spin_locked(&lockres->l_lock);
@@ -2185,7 +2185,7 @@
return 1;
}
-static int ocfs2_cancel_convert(ocfs2_super *osb,
+static int ocfs2_cancel_convert(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres)
{
int ret;
@@ -2246,7 +2246,7 @@
struct ocfs2_lock_res *lockres = &OCFS2_I(inode)->ip_meta_lockres;
unsigned long flags;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
mlog_entry_void();
@@ -2312,7 +2312,7 @@
return ret;
}
-static int ocfs2_generic_unblock_lock(ocfs2_super *osb,
+static int ocfs2_generic_unblock_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
int *requeue,
ocfs2_convert_worker_t *worker)
@@ -2431,7 +2431,7 @@
{
int status;
struct inode *inode;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
mlog_entry_void();
@@ -2507,7 +2507,7 @@
int *requeue)
{
int status;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
mlog_entry_void();
@@ -2526,7 +2526,7 @@
return status;
}
-void ocfs2_process_blocked_lock(ocfs2_super *osb,
+void ocfs2_process_blocked_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres)
{
int status;
@@ -2573,7 +2573,7 @@
mlog_exit_void();
}
-static void ocfs2_schedule_blocked_lock(ocfs2_super *osb,
+static void ocfs2_schedule_blocked_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres)
{
mlog_entry_void();
Modified: branches/enotypedefs/fs/ocfs2/dlmglue.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlmglue.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/dlmglue.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -51,8 +51,8 @@
/* don't block waiting for the vote thread, instead return -EAGAIN */
#define OCFS2_LOCK_NONBLOCK (0x04)
-int ocfs2_dlm_init(ocfs2_super *osb);
-void ocfs2_dlm_shutdown(ocfs2_super *osb);
+int ocfs2_dlm_init(struct ocfs2_super *osb);
+void ocfs2_dlm_shutdown(struct ocfs2_super *osb);
void ocfs2_lock_res_init_once(struct ocfs2_lock_res *res);
void ocfs2_inode_lock_res_init(struct ocfs2_lock_res *res,
enum ocfs2_lock_type type,
@@ -86,16 +86,16 @@
#define ocfs2_meta_lock(i, h, b, e) ocfs2_meta_lock_full(i, h, b, e, 0)
void ocfs2_meta_unlock(struct inode *inode,
int ex);
-int ocfs2_super_lock(ocfs2_super *osb,
+int ocfs2_super_lock(struct ocfs2_super *osb,
int ex);
-void ocfs2_super_unlock(ocfs2_super *osb,
+void ocfs2_super_unlock(struct ocfs2_super *osb,
int ex);
-int ocfs2_rename_lock(ocfs2_super *osb);
-void ocfs2_rename_unlock(ocfs2_super *osb);
+int ocfs2_rename_lock(struct ocfs2_super *osb);
+void ocfs2_rename_unlock(struct ocfs2_super *osb);
void ocfs2_mark_lockres_freeing(struct ocfs2_lock_res *lockres);
/* for the vote thread */
-void ocfs2_process_blocked_lock(ocfs2_super *osb,
+void ocfs2_process_blocked_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres);
/* aids in debugging and tracking lvbs */
Modified: branches/enotypedefs/fs/ocfs2/file.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/file.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/file.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -124,7 +124,7 @@
int err = 0;
journal_t *journal;
struct inode *inode = dentry->d_inode;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
mlog_entry("(0x%p, 0x%p, %d, '%.*s')\n", file, dentry, datasync,
dentry->d_name.len, dentry->d_name.name);
@@ -171,7 +171,7 @@
u64 new_i_size)
{
int ret;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_journal_handle *handle = NULL;
handle = ocfs2_start_trans(osb, NULL,
@@ -192,7 +192,7 @@
return ret;
}
-static int ocfs2_orphan_for_truncate(ocfs2_super *osb,
+static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh,
u64 new_i_size)
@@ -228,7 +228,7 @@
{
int status = 0;
struct ocfs2_dinode *fe = NULL;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_truncate_context *tc = NULL;
mlog_entry("(inode = %"MLFu64", new_i_size = %"MLFu64"\n",
@@ -326,7 +326,7 @@
* Will return -EAGAIN, and a reason if a restart is needed.
* If passed in, *reason will always be set, even in error.
*/
-int ocfs2_do_extend_allocation(ocfs2_super *osb,
+int ocfs2_do_extend_allocation(struct ocfs2_super *osb,
struct inode *inode,
u32 clusters_to_add,
struct buffer_head *fe_bh,
@@ -439,7 +439,7 @@
struct ocfs2_alloc_context *data_ac = NULL;
struct ocfs2_alloc_context *meta_ac = NULL;
enum ocfs2_alloc_restarted why;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
mlog_entry("(clusters_to_add = %u)\n", clusters_to_add);
@@ -748,7 +748,7 @@
int status = 0, size_change;
struct inode *inode = dentry->d_inode;
struct super_block *sb = inode->i_sb;
- ocfs2_super *osb = OCFS2_SB(sb);
+ struct ocfs2_super *osb = OCFS2_SB(sb);
struct buffer_head *bh = NULL;
struct ocfs2_journal_handle *handle = NULL;
@@ -844,7 +844,7 @@
{
struct inode *inode = dentry->d_inode;
struct super_block *sb = dentry->d_inode->i_sb;
- ocfs2_super *osb = sb->s_fs_info;
+ struct ocfs2_super *osb = sb->s_fs_info;
int err;
mlog_entry_void();
@@ -880,7 +880,7 @@
struct inode *inode = filp->f_dentry->d_inode;
loff_t newsize, saved_pos;
#ifdef OCFS2_ORACORE_WORKAROUNDS
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
#endif
mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", filp, buf,
@@ -1063,7 +1063,7 @@
struct file *filp = iocb->ki_filp;
struct inode *inode = filp->f_dentry->d_inode;
#ifdef OCFS2_ORACORE_WORKAROUNDS
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
#endif
mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", filp, buf,
Modified: branches/enotypedefs/fs/ocfs2/file.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/file.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/file.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -37,7 +37,7 @@
RESTART_TRANS,
RESTART_META
};
-int ocfs2_do_extend_allocation(ocfs2_super *osb,
+int ocfs2_do_extend_allocation(struct ocfs2_super *osb,
struct inode *inode,
u32 clusters_to_add,
struct buffer_head *fe_bh,
Modified: branches/enotypedefs/fs/ocfs2/heartbeat.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/heartbeat.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/heartbeat.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -61,7 +61,7 @@
static void __ocfs2_node_map_set(struct ocfs2_node_map *target,
struct ocfs2_node_map *from);
-void ocfs2_init_node_maps(ocfs2_super *osb)
+void ocfs2_init_node_maps(struct ocfs2_super *osb)
{
spin_lock_init(&osb->node_map_lock);
ocfs2_node_map_init(&osb->mounted_map);
@@ -70,7 +70,7 @@
}
static void ocfs2_do_node_down(int node_num,
- ocfs2_super *osb)
+ struct ocfs2_super *osb)
{
BUG_ON(osb->node_num == node_num);
@@ -103,7 +103,7 @@
int node_num,
void *data)
{
- ocfs2_do_node_down(node_num, (ocfs2_super *) data);
+ ocfs2_do_node_down(node_num, (struct ocfs2_super *) data);
}
/* Called from the dlm when it's about to evict a node. We may also
@@ -111,7 +111,7 @@
static void ocfs2_dlm_eviction_cb(int node_num,
void *data)
{
- ocfs2_super *osb = (ocfs2_super *) data;
+ struct ocfs2_super *osb = (struct ocfs2_super *) data;
struct super_block *sb = osb->sb;
mlog(ML_NOTICE, "device (%u,%u): dlm has evicted node %d\n",
@@ -124,7 +124,7 @@
int node_num,
void *data)
{
- ocfs2_super *osb = data;
+ struct ocfs2_super *osb = data;
BUG_ON(osb->node_num == node_num);
@@ -132,7 +132,7 @@
ocfs2_node_map_clear_bit(osb, &osb->umount_map, node_num);
}
-void ocfs2_setup_hb_callbacks(ocfs2_super *osb)
+void ocfs2_setup_hb_callbacks(struct ocfs2_super *osb)
{
o2hb_setup_callback(&osb->osb_hb_down, O2HB_NODE_DOWN_CB,
ocfs2_hb_node_down_cb, osb,
@@ -149,7 +149,7 @@
}
/* Most functions here are just stubs for now... */
-int ocfs2_register_hb_callbacks(ocfs2_super *osb)
+int ocfs2_register_hb_callbacks(struct ocfs2_super *osb)
{
int status;
@@ -167,7 +167,7 @@
return status;
}
-void ocfs2_clear_hb_callbacks(ocfs2_super *osb)
+void ocfs2_clear_hb_callbacks(struct ocfs2_super *osb)
{
int status;
@@ -180,7 +180,7 @@
mlog_errno(status);
}
-void ocfs2_stop_heartbeat(ocfs2_super *osb)
+void ocfs2_stop_heartbeat(struct ocfs2_super *osb)
{
int ret;
char *argv[5], *envp[3];
@@ -224,7 +224,7 @@
set_bit(bit, map->map);
}
-void ocfs2_node_map_set_bit(ocfs2_super *osb,
+void ocfs2_node_map_set_bit(struct ocfs2_super *osb,
struct ocfs2_node_map *map,
int bit)
{
@@ -242,7 +242,7 @@
clear_bit(bit, map->map);
}
-void ocfs2_node_map_clear_bit(ocfs2_super *osb,
+void ocfs2_node_map_clear_bit(struct ocfs2_super *osb,
struct ocfs2_node_map *map,
int bit)
{
@@ -254,7 +254,7 @@
spin_unlock(&osb->node_map_lock);
}
-int ocfs2_node_map_test_bit(ocfs2_super *osb,
+int ocfs2_node_map_test_bit(struct ocfs2_super *osb,
struct ocfs2_node_map *map,
int bit)
{
@@ -278,7 +278,7 @@
return 1;
}
-int ocfs2_node_map_is_empty(ocfs2_super *osb,
+int ocfs2_node_map_is_empty(struct ocfs2_super *osb,
struct ocfs2_node_map *map)
{
int ret;
@@ -298,7 +298,7 @@
}
/* returns 1 if bit is the only bit set in target, 0 otherwise */
-int ocfs2_node_map_is_only(ocfs2_super *osb,
+int ocfs2_node_map_is_only(struct ocfs2_super *osb,
struct ocfs2_node_map *target,
int bit)
{
@@ -329,7 +329,7 @@
/* Returns whether the recovery bit was actually set - it may not be
* if a node is still marked as needing recovery */
-int ocfs2_recovery_map_set(ocfs2_super *osb,
+int ocfs2_recovery_map_set(struct ocfs2_super *osb,
int num)
{
int set = 0;
@@ -348,13 +348,13 @@
return set;
}
-void ocfs2_recovery_map_clear(ocfs2_super *osb,
+void ocfs2_recovery_map_clear(struct ocfs2_super *osb,
int num)
{
ocfs2_node_map_clear_bit(osb, &osb->recovery_map, num);
}
-int ocfs2_node_map_iterate(ocfs2_super *osb,
+int ocfs2_node_map_iterate(struct ocfs2_super *osb,
struct ocfs2_node_map *map,
int idx)
{
Modified: branches/enotypedefs/fs/ocfs2/heartbeat.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/heartbeat.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/heartbeat.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -26,41 +26,41 @@
#ifndef OCFS2_HEARTBEAT_H
#define OCFS2_HEARTBEAT_H
-void ocfs2_init_node_maps(ocfs2_super *osb);
+void ocfs2_init_node_maps(struct ocfs2_super *osb);
-void ocfs2_setup_hb_callbacks(ocfs2_super *osb);
-int ocfs2_register_hb_callbacks(ocfs2_super *osb);
-void ocfs2_clear_hb_callbacks(ocfs2_super *osb);
-void ocfs2_stop_heartbeat(ocfs2_super *osb);
+void ocfs2_setup_hb_callbacks(struct ocfs2_super *osb);
+int ocfs2_register_hb_callbacks(struct ocfs2_super *osb);
+void ocfs2_clear_hb_callbacks(struct ocfs2_super *osb);
+void ocfs2_stop_heartbeat(struct ocfs2_super *osb);
/* node map functions - used to keep track of mounted and in-recovery
* nodes. */
void ocfs2_node_map_init(struct ocfs2_node_map *map);
-int ocfs2_node_map_is_empty(ocfs2_super *osb,
+int ocfs2_node_map_is_empty(struct ocfs2_super *osb,
struct ocfs2_node_map *map);
-void ocfs2_node_map_set_bit(ocfs2_super *osb,
+void ocfs2_node_map_set_bit(struct ocfs2_super *osb,
struct ocfs2_node_map *map,
int bit);
-void ocfs2_node_map_clear_bit(ocfs2_super *osb,
+void ocfs2_node_map_clear_bit(struct ocfs2_super *osb,
struct ocfs2_node_map *map,
int bit);
-int ocfs2_node_map_test_bit(ocfs2_super *osb,
+int ocfs2_node_map_test_bit(struct ocfs2_super *osb,
struct ocfs2_node_map *map,
int bit);
-int ocfs2_node_map_iterate(ocfs2_super *osb,
+int ocfs2_node_map_iterate(struct ocfs2_super *osb,
struct ocfs2_node_map *map,
int idx);
-static inline int ocfs2_node_map_first_set_bit(ocfs2_super *osb,
+static inline int ocfs2_node_map_first_set_bit(struct ocfs2_super *osb,
struct ocfs2_node_map *map)
{
return ocfs2_node_map_iterate(osb, map, 0);
}
-int ocfs2_recovery_map_set(ocfs2_super *osb,
+int ocfs2_recovery_map_set(struct ocfs2_super *osb,
int num);
-void ocfs2_recovery_map_clear(ocfs2_super *osb,
+void ocfs2_recovery_map_clear(struct ocfs2_super *osb,
int num);
/* returns 1 if bit is the only bit set in target, 0 otherwise */
-int ocfs2_node_map_is_only(ocfs2_super *osb,
+int ocfs2_node_map_is_only(struct ocfs2_super *osb,
struct ocfs2_node_map *target,
int bit);
Modified: branches/enotypedefs/fs/ocfs2/inode.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/inode.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/inode.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -66,11 +66,11 @@
struct ocfs2_find_inode_args *args);
static int ocfs2_init_locked_inode(struct inode *inode, void *opaque);
static int ocfs2_find_actor(struct inode *inode, void *opaque);
-static int ocfs2_truncate_for_delete(ocfs2_super *osb,
+static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh);
-struct inode *ocfs2_ilookup_for_vote(ocfs2_super *osb,
+struct inode *ocfs2_ilookup_for_vote(struct ocfs2_super *osb,
u64 blkno,
int delete_vote)
{
@@ -88,7 +88,7 @@
return ilookup5(osb->sb, args.fi_ino, ocfs2_find_actor, &args);
}
-struct inode *ocfs2_iget(ocfs2_super *osb, u64 blkno)
+struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno)
{
struct inode *inode = NULL;
struct super_block *sb = osb->sb;
@@ -215,7 +215,7 @@
int create_ino)
{
struct super_block *sb;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
int status = -EINVAL;
mlog_entry("(0x%p, size:%"MLFu64")\n", inode, fe->i_size);
@@ -336,7 +336,7 @@
struct ocfs2_find_inode_args *args)
{
struct super_block *sb;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
struct ocfs2_dinode *fe;
struct buffer_head *bh = NULL;
int status;
@@ -411,7 +411,7 @@
sync_blockdev(sb->s_bdev);
}
-static int ocfs2_truncate_for_delete(ocfs2_super *osb,
+static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh)
{
@@ -473,7 +473,7 @@
struct inode *inode_alloc_inode = NULL;
struct buffer_head *inode_alloc_bh = NULL;
struct ocfs2_journal_handle *handle;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_dinode *di = (struct ocfs2_dinode *) di_bh->b_data;
inode_alloc_inode =
@@ -550,7 +550,7 @@
int status, orphaned_slot;
struct inode *orphan_dir_inode = NULL;
struct buffer_head *orphan_dir_bh = NULL;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
/* We've already voted on this so it should be readonly - no
* spinlock needed. */
@@ -607,7 +607,7 @@
{
int ret = 0;
struct ocfs2_inode_info *oi = OCFS2_I(inode);
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
/* We shouldn't be getting here for the root directory
* inode.. */
@@ -1116,7 +1116,7 @@
void ocfs2_refresh_inode(struct inode *inode,
struct ocfs2_dinode *fe)
{
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
spin_lock(&OCFS2_I(inode)->ip_lock);
Modified: branches/enotypedefs/fs/ocfs2/inode.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/inode.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/inode.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -121,8 +121,8 @@
void ocfs2_clear_inode(struct inode *inode);
void ocfs2_delete_inode(struct inode *inode);
void ocfs2_drop_inode(struct inode *inode);
-struct inode *ocfs2_iget(ocfs2_super *osb, u64 feoff);
-struct inode *ocfs2_ilookup_for_vote(ocfs2_super *osb,
+struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 feoff);
+struct inode *ocfs2_ilookup_for_vote(struct ocfs2_super *osb,
u64 blkno,
int delete_vote);
int ocfs2_inode_init_private(struct inode *inode);
Modified: branches/enotypedefs/fs/ocfs2/journal.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/journal.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/journal.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -52,23 +52,23 @@
spinlock_t trans_inc_lock = SPIN_LOCK_UNLOCKED;
static int ocfs2_force_read_journal(struct inode *inode);
-static int ocfs2_recover_node(ocfs2_super *osb,
- int node_num);
+static int ocfs2_recover_node(struct ocfs2_super *osb,
+ int node_num);
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 int ocfs2_commit_cache(struct ocfs2_super *osb);
+static int ocfs2_wait_on_mount(struct ocfs2_super *osb);
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,
+static int ocfs2_journal_toggle_dirty(struct ocfs2_super *osb,
+ int dirty);
+static int ocfs2_trylock_journal(struct ocfs2_super *osb,
int slot_num);
-static int ocfs2_recover_orphans(ocfs2_super *osb,
- int slot);
+static int ocfs2_recover_orphans(struct ocfs2_super *osb,
+ int slot);
static int ocfs2_commit_thread(void *arg);
-static int ocfs2_commit_cache(ocfs2_super *osb)
+static int ocfs2_commit_cache(struct ocfs2_super *osb)
{
int status = 0;
unsigned int flushed;
@@ -113,7 +113,7 @@
return status;
}
-struct ocfs2_journal_handle *ocfs2_alloc_handle(ocfs2_super *osb)
+struct ocfs2_journal_handle *ocfs2_alloc_handle(struct ocfs2_super *osb)
{
struct ocfs2_journal_handle *retval = NULL;
@@ -138,7 +138,7 @@
/* 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. */
-struct ocfs2_journal_handle *ocfs2_start_trans(ocfs2_super *osb,
+struct ocfs2_journal_handle *ocfs2_start_trans(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
int max_buffs)
{
@@ -513,7 +513,7 @@
#define OCFS2_DEFAULT_COMMIT_INTERVAL (HZ * 5)
-void ocfs2_set_journal_params(ocfs2_super *osb)
+void ocfs2_set_journal_params(struct ocfs2_super *osb)
{
journal_t *journal = osb->journal->j_journal;
@@ -533,7 +533,7 @@
journal_t *j_journal = NULL;
struct ocfs2_dinode *di = NULL;
struct buffer_head *bh = NULL;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
int meta_lock = 0;
mlog_entry_void();
@@ -621,7 +621,7 @@
return status;
}
-static int ocfs2_journal_toggle_dirty(ocfs2_super *osb,
+static int ocfs2_journal_toggle_dirty(struct ocfs2_super *osb,
int dirty)
{
int status;
@@ -663,7 +663,7 @@
* If the journal has been kmalloc'd it needs to be freed after this
* call.
*/
-void ocfs2_journal_shutdown(ocfs2_super *osb)
+void ocfs2_journal_shutdown(struct ocfs2_super *osb)
{
struct ocfs2_journal *journal = NULL;
int status = 0;
@@ -757,7 +757,7 @@
int ocfs2_journal_load(struct ocfs2_journal *journal)
{
int status = 0;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
mlog_entry_void();
@@ -910,7 +910,7 @@
void ocfs2_complete_recovery(void *data)
{
int ret;
- ocfs2_super *osb = data;
+ struct ocfs2_super *osb = data;
struct ocfs2_journal *journal = osb->journal;
struct ocfs2_dinode *la_dinode, *tl_dinode;
struct ocfs2_la_recovery_item *item;
@@ -1006,7 +1006,7 @@
/* Called by the mount code to queue recovery the last part of
* recovery for it's own slot. */
-void ocfs2_complete_mount_recovery(ocfs2_super *osb)
+void ocfs2_complete_mount_recovery(struct ocfs2_super *osb)
{
struct ocfs2_journal *journal = osb->journal;
@@ -1027,7 +1027,7 @@
static int __ocfs2_recovery_thread(void *arg)
{
int status, node_num;
- ocfs2_super *osb = arg;
+ struct ocfs2_super *osb = arg;
mlog_entry_void();
@@ -1093,7 +1093,7 @@
return status;
}
-void ocfs2_recovery_thread(ocfs2_super *osb, int node_num)
+void ocfs2_recovery_thread(struct ocfs2_super *osb, int node_num)
{
mlog_entry("(node_num=%d, osb->node_num = %d)\n",
node_num, osb->node_num);
@@ -1128,7 +1128,7 @@
/* Does the actual journal replay and marks the journal inode as
* clean. Will only replay if the journal inode is marked dirty. */
-static int ocfs2_replay_journal(ocfs2_super *osb,
+static int ocfs2_replay_journal(struct ocfs2_super *osb,
int node_num,
int slot_num)
{
@@ -1255,8 +1255,8 @@
* second part of a nodes recovery process (local alloc recovery) is
* far less concerning.
*/
-static int ocfs2_recover_node(ocfs2_super *osb,
- int node_num)
+static int ocfs2_recover_node(struct ocfs2_super *osb,
+ int node_num)
{
int status = 0;
int slot_num;
@@ -1324,7 +1324,7 @@
/* Test node liveness by trylocking his journal. If we get the lock,
* we drop it here. Return 0 if we got the lock, -EAGAIN if node is
* still alive (we couldn't get the lock) and < 0 on error. */
-static int ocfs2_trylock_journal(ocfs2_super *osb,
+static int ocfs2_trylock_journal(struct ocfs2_super *osb,
int slot_num)
{
int status, flags;
@@ -1364,7 +1364,7 @@
/* Call this underneath ocfs2_super_lock. It also assumes that the
* slot info struct has been updated from disk. */
-int ocfs2_mark_dead_nodes(ocfs2_super *osb)
+int ocfs2_mark_dead_nodes(struct ocfs2_super *osb)
{
int status, i, node_num;
struct ocfs2_slot_info *si = osb->slot_info;
@@ -1408,7 +1408,7 @@
return status;
}
-static int ocfs2_recover_orphans(ocfs2_super *osb,
+static int ocfs2_recover_orphans(struct ocfs2_super *osb,
int slot)
{
int status = 0;
@@ -1551,7 +1551,7 @@
return status;
}
-static int ocfs2_wait_on_mount(ocfs2_super *osb)
+static int ocfs2_wait_on_mount(struct ocfs2_super *osb)
{
/* This check is good because ocfs2 will wait on our recovery
* thread before changing it to something other than MOUNTED
@@ -1574,7 +1574,7 @@
static int ocfs2_commit_thread(void *arg)
{
int status;
- ocfs2_super *osb = arg;
+ struct ocfs2_super *osb = arg;
struct ocfs2_journal *journal = osb->journal;
/* we can trust j_num_trans here because _should_stop() is only set in
@@ -1607,7 +1607,7 @@
/* Look for a dirty journal without taking any cluster locks. Used for
* hard readonly access to determine whether the file system journals
* require recovery. */
-int ocfs2_check_journals_nolocks(ocfs2_super *osb)
+int ocfs2_check_journals_nolocks(struct ocfs2_super *osb)
{
int ret = 0;
unsigned int slot;
Modified: branches/enotypedefs/fs/ocfs2/journal.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/journal.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/journal.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -37,7 +37,7 @@
OCFS2_JOURNAL_IN_SHUTDOWN,
};
-struct _ocfs2_super;
+struct ocfs2_super;
struct ocfs2_dinode;
struct ocfs2_journal_handle;
@@ -47,7 +47,7 @@
journal_t *j_journal; /* The kernels journal type */
struct inode *j_inode; /* Kernel inode pointing to
* this journal */
- struct _ocfs2_super *j_osb; /* pointer to the super
+ struct ocfs2_super *j_osb; /* pointer to the super
* block for the node
* we're currently
* running on -- not
@@ -127,7 +127,7 @@
return ret;
}
-static inline void ocfs2_inode_set_new(ocfs2_super *osb,
+static inline void ocfs2_inode_set_new(struct ocfs2_super *osb,
struct inode *inode)
{
spin_lock(&trans_inc_lock);
@@ -192,20 +192,20 @@
* event on.
* ocfs2_start_checkpoint - Kick the commit thread to do a checkpoint.
*/
-void ocfs2_set_journal_params(ocfs2_super *osb);
+void ocfs2_set_journal_params(struct ocfs2_super *osb);
int ocfs2_journal_init(struct ocfs2_journal *journal,
int *dirty);
-void ocfs2_journal_shutdown(struct _ocfs2_super *osb);
+void ocfs2_journal_shutdown(struct ocfs2_super *osb);
int ocfs2_journal_wipe(struct ocfs2_journal *journal,
int full);
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 ocfs2_check_journals_nolocks(struct ocfs2_super *osb);
+void ocfs2_recovery_thread(struct ocfs2_super *osb,
int node_num);
-int ocfs2_mark_dead_nodes(ocfs2_super *osb);
-void ocfs2_complete_mount_recovery(ocfs2_super *osb);
+int ocfs2_mark_dead_nodes(struct ocfs2_super *osb);
+void ocfs2_complete_mount_recovery(struct ocfs2_super *osb);
-static inline void ocfs2_start_checkpoint(struct _ocfs2_super *osb)
+static inline void ocfs2_start_checkpoint(struct ocfs2_super *osb)
{
atomic_set(&osb->needs_checkpoint, 1);
wake_up(&osb->checkpoint_event);
@@ -213,7 +213,7 @@
static inline void ocfs2_checkpoint_inode(struct inode *inode)
{
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
if (!ocfs2_inode_fully_checkpointed(inode)) {
/* WARNING: This only kicks off a single
@@ -262,8 +262,8 @@
/* 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. */
-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 *ocfs2_alloc_handle(struct 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);
Modified: branches/enotypedefs/fs/ocfs2/localalloc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/localalloc.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/localalloc.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -47,33 +47,33 @@
#define OCFS2_LOCAL_ALLOC(dinode) (&((dinode)->id2.i_lab))
-static inline int ocfs2_local_alloc_window_bits(ocfs2_super *osb);
+static inline int ocfs2_local_alloc_window_bits(struct ocfs2_super *osb);
static u32 ocfs2_local_alloc_count_bits(struct ocfs2_dinode *alloc);
-static int ocfs2_local_alloc_find_clear_bits(ocfs2_super *osb,
+static int ocfs2_local_alloc_find_clear_bits(struct ocfs2_super *osb,
struct ocfs2_dinode *alloc,
u32 numbits);
static void ocfs2_clear_local_alloc(struct ocfs2_dinode *alloc);
-static int ocfs2_sync_local_to_main(ocfs2_super *osb,
+static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct 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,
+static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context **ac,
struct inode **bitmap_inode,
struct buffer_head **bitmap_bh);
-static int ocfs2_local_alloc_new_window(ocfs2_super *osb,
+static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context *ac);
-static int ocfs2_local_alloc_slide_window(ocfs2_super *osb,
+static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
struct inode *local_alloc_inode);
/*
@@ -83,7 +83,7 @@
* been chosen so that most allocations, including new block groups go
* through local alloc.
*/
-static inline int ocfs2_local_alloc_window_bits(ocfs2_super *osb)
+static inline int ocfs2_local_alloc_window_bits(struct ocfs2_super *osb)
{
BUG_ON(osb->s_clustersize_bits < 12);
@@ -94,7 +94,7 @@
* Tell us whether a given allocation should use the local alloc
* file. Otherwise, it has to go to the main bitmap.
*/
-int ocfs2_alloc_should_use_local(ocfs2_super *osb, u64 bits)
+int ocfs2_alloc_should_use_local(struct ocfs2_super *osb, u64 bits)
{
int la_bits = ocfs2_local_alloc_window_bits(osb);
@@ -111,7 +111,7 @@
return 1;
}
-int ocfs2_load_local_alloc(ocfs2_super *osb)
+int ocfs2_load_local_alloc(struct ocfs2_super *osb)
{
int status = 0;
struct ocfs2_dinode *alloc = NULL;
@@ -193,7 +193,7 @@
* local_alloc_bh is optional. If not passed, we will simply use the
* one off osb. If you do pass it however, be warned that it *will* be
* returned brelse'd and NULL'd out.*/
-void ocfs2_shutdown_local_alloc(ocfs2_super *osb)
+void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
{
int status;
struct ocfs2_journal_handle *handle = NULL;
@@ -312,7 +312,7 @@
* we kmalloc a copy of the local alloc before it's change for the
* caller to process with ocfs2_complete_local_alloc_recovery
*/
-int ocfs2_begin_local_alloc_recovery(ocfs2_super *osb,
+int ocfs2_begin_local_alloc_recovery(struct ocfs2_super *osb,
int slot_num,
struct ocfs2_dinode **alloc_copy)
{
@@ -381,7 +381,7 @@
* recovery map. Dlm locks will no longer stall, so lets clear out the
* main bitmap.
*/
-int ocfs2_complete_local_alloc_recovery(ocfs2_super *osb,
+int ocfs2_complete_local_alloc_recovery(struct ocfs2_super *osb,
struct ocfs2_dinode *alloc)
{
int status;
@@ -451,7 +451,7 @@
* We will add ourselves to the transaction passed in, but may start
* our own in order to shift windows.
*/
-int ocfs2_reserve_local_alloc_bits(ocfs2_super *osb,
+int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
struct ocfs2_journal_handle *passed_handle,
u32 bits_wanted,
struct ocfs2_alloc_context *ac)
@@ -528,7 +528,7 @@
return status;
}
-int ocfs2_claim_local_alloc_bits(ocfs2_super *osb,
+int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context *ac,
u32 min_bits,
@@ -607,7 +607,7 @@
return count;
}
-static int ocfs2_local_alloc_find_clear_bits(ocfs2_super *osb,
+static int ocfs2_local_alloc_find_clear_bits(struct ocfs2_super *osb,
struct ocfs2_dinode *alloc,
u32 numbits)
{
@@ -706,7 +706,7 @@
* assumes you've already locked the main bitmap -- the bitmap inode
* passed is used for caching.
*/
-static int ocfs2_sync_local_to_main(ocfs2_super *osb,
+static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_dinode *alloc,
struct inode *main_bm_inode,
@@ -776,7 +776,7 @@
return status;
}
-static int ocfs2_local_alloc_reserve_for_window(ocfs2_super *osb,
+static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context **ac,
struct inode **bitmap_inode,
@@ -819,7 +819,7 @@
/*
* pass it the bitmap lock in lock_bh if you have it.
*/
-static int ocfs2_local_alloc_new_window(ocfs2_super *osb,
+static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context *ac)
{
@@ -873,8 +873,8 @@
/* Note that we do *NOT* lock the local alloc inode here as
* it's been locked already for us. */
-static int ocfs2_local_alloc_slide_window(ocfs2_super *osb,
- struct inode *local_alloc_inode)
+static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
+ struct inode *local_alloc_inode)
{
int status = 0;
struct buffer_head *main_bm_bh = NULL;
Modified: branches/enotypedefs/fs/ocfs2/localalloc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/localalloc.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/localalloc.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -26,27 +26,27 @@
#ifndef OCFS2_LOCALALLOC_H
#define OCFS2_LOCALALLOC_H
-int ocfs2_load_local_alloc(ocfs2_super *osb);
+int ocfs2_load_local_alloc(struct ocfs2_super *osb);
-void ocfs2_shutdown_local_alloc(ocfs2_super *osb);
+void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb);
-int ocfs2_begin_local_alloc_recovery(ocfs2_super *osb,
+int ocfs2_begin_local_alloc_recovery(struct ocfs2_super *osb,
int node_num,
struct ocfs2_dinode **alloc_copy);
-int ocfs2_complete_local_alloc_recovery(ocfs2_super *osb,
+int ocfs2_complete_local_alloc_recovery(struct ocfs2_super *osb,
struct ocfs2_dinode *alloc);
-int ocfs2_alloc_should_use_local(ocfs2_super *osb,
+int ocfs2_alloc_should_use_local(struct ocfs2_super *osb,
u64 bits);
struct ocfs2_alloc_context;
-int ocfs2_reserve_local_alloc_bits(ocfs2_super *osb,
+int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
struct ocfs2_journal_handle *passed_handle,
u32 bits_wanted,
struct ocfs2_alloc_context *ac);
-int ocfs2_claim_local_alloc_bits(ocfs2_super *osb,
+int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context *ac,
u32 min_bits,
Modified: branches/enotypedefs/fs/ocfs2/namei.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/namei.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/namei.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -86,7 +86,8 @@
struct buffer_head *parent_fe_bh,
struct buffer_head *insert_bh);
-static int ocfs2_mknod_locked(ocfs2_super *osb, struct inode *dir,
+static int ocfs2_mknod_locked(struct ocfs2_super *osb,
+ struct inode *dir,
struct dentry *dentry, int mode,
dev_t dev,
struct buffer_head **new_fe_bh,
@@ -95,34 +96,34 @@
struct inode **ret_inode,
struct ocfs2_alloc_context *inode_ac);
-static int ocfs2_fill_new_dir(ocfs2_super *osb,
+static int ocfs2_fill_new_dir(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *parent,
struct inode *inode,
struct buffer_head *fe_bh,
struct ocfs2_alloc_context *data_ac);
-static int ocfs2_double_lock(ocfs2_super *osb,
+static int ocfs2_double_lock(struct ocfs2_super *osb,
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,
+static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
char *name,
struct buffer_head **de_bh);
-static int ocfs2_orphan_add(ocfs2_super *osb,
+static int ocfs2_orphan_add(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
struct ocfs2_dinode *fe,
char *name,
struct buffer_head *de_bh);
-static int ocfs2_create_symlink_data(ocfs2_super *osb,
+static int ocfs2_create_symlink_data(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
const char *symname);
@@ -216,7 +217,7 @@
return ret;
}
-static int ocfs2_fill_new_dir(ocfs2_super *osb,
+static int ocfs2_fill_new_dir(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *parent,
struct inode *inode,
@@ -293,7 +294,7 @@
int status = 0;
struct buffer_head *parent_fe_bh = NULL;
struct ocfs2_journal_handle *handle = NULL;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
struct ocfs2_dinode *dirfe;
struct buffer_head *new_fe_bh = NULL;
struct buffer_head *de_bh = NULL;
@@ -451,7 +452,8 @@
return status;
}
-static int ocfs2_mknod_locked(ocfs2_super *osb, struct inode *dir,
+static int ocfs2_mknod_locked(struct ocfs2_super *osb,
+ struct inode *dir,
struct dentry *dentry, int mode,
dev_t dev,
struct buffer_head **new_fe_bh,
@@ -629,7 +631,7 @@
struct buffer_head *parent_fe_bh = NULL;
struct buffer_head *de_bh = NULL;
struct ocfs2_dinode *fe = NULL;
- ocfs2_super *osb = OCFS2_SB(dir->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(dir->i_sb);
mlog_entry("(inode=%lu, old='%.*s' new='%.*s')\n", inode->i_ino,
old_dentry->d_name.len, old_dentry->d_name.name,
@@ -747,7 +749,7 @@
int status;
unsigned int saved_nlink = 0;
struct inode *inode = dentry->d_inode;
- ocfs2_super *osb = OCFS2_SB(dir->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(dir->i_sb);
u64 blkno;
struct ocfs2_dinode *fe = NULL;
struct buffer_head *fe_bh = NULL;
@@ -931,7 +933,7 @@
* 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 ocfs2_double_lock(ocfs2_super *osb,
+static int ocfs2_double_lock(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct buffer_head **bh1,
struct inode *inode1,
@@ -1005,7 +1007,7 @@
struct buffer_head *orphan_entry_bh = NULL;
struct buffer_head *newfe_bh = NULL;
struct buffer_head *insert_entry_bh = NULL;
- ocfs2_super *osb = NULL;
+ struct ocfs2_super *osb = NULL;
u64 newfe_blkno;
struct ocfs2_journal_handle *handle = NULL;
struct buffer_head *old_dir_bh = NULL;
@@ -1424,7 +1426,7 @@
* we expect i_size = strlen(symname). Copy symname into the file
* data, including the null terminator.
*/
-static int ocfs2_create_symlink_data(ocfs2_super *osb,
+static int ocfs2_create_symlink_data(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
const char *symname)
@@ -1531,7 +1533,7 @@
{
int status, l, credits;
u64 newsize;
- ocfs2_super *osb = NULL;
+ struct ocfs2_super *osb = NULL;
struct inode *inode = NULL;
struct super_block *sb;
struct buffer_head *new_fe_bh = NULL;
@@ -2044,7 +2046,7 @@
return status;
}
-static int ocfs2_prepare_orphan_dir(ocfs2_super *osb,
+static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
char *name,
@@ -2095,7 +2097,7 @@
return status;
}
-static int ocfs2_orphan_add(ocfs2_super *osb,
+static int ocfs2_orphan_add(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
struct ocfs2_dinode *fe,
@@ -2180,7 +2182,7 @@
}
/* unlike orphan_add, we expect the orphan dir to already be locked here. */
-int ocfs2_orphan_del(ocfs2_super *osb,
+int ocfs2_orphan_del(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *orphan_dir_inode,
struct inode *inode,
Modified: branches/enotypedefs/fs/ocfs2/namei.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/namei.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/namei.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -38,7 +38,7 @@
int namelen,
struct inode *dir,
struct ocfs2_dir_entry **res_dir);
-int ocfs2_orphan_del(ocfs2_super *osb,
+int ocfs2_orphan_del(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *orphan_dir_inode,
struct inode *inode,
Modified: branches/enotypedefs/fs/ocfs2/ocfs2.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/ocfs2.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/ocfs2.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -175,7 +175,7 @@
struct ocfs2_journal;
struct ocfs2_journal_handle;
-typedef struct _ocfs2_super
+struct ocfs2_super
{
u32 osb_id; /* id used by the proc interface */
struct task_struct *commit_task;
@@ -277,9 +277,9 @@
struct inode *osb_tl_inode;
struct buffer_head *osb_tl_bh;
struct work_struct osb_truncate_log_wq;
-} ocfs2_super;
+};
-#define OCFS2_SB(sb) ((ocfs2_super *)(sb)->s_fs_info)
+#define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info)
#define OCFS2_MAX_OSB_ID 65536
static inline int ocfs2_should_order_data(struct inode *inode)
@@ -295,7 +295,7 @@
* in parallel so we want the transitions to be atomic. this also
* means that any future flags osb_flags must be protected by spinlock
* too! */
-static inline void ocfs2_set_osb_flag(ocfs2_super *osb,
+static inline void ocfs2_set_osb_flag(struct ocfs2_super *osb,
unsigned long flag)
{
spin_lock(&osb->osb_lock);
@@ -303,7 +303,7 @@
spin_unlock(&osb->osb_lock);
}
-static inline void ocfs2_set_ro_flag(ocfs2_super *osb,
+static inline void ocfs2_set_ro_flag(struct ocfs2_super *osb,
int hard)
{
spin_lock(&osb->osb_lock);
@@ -315,7 +315,7 @@
spin_unlock(&osb->osb_lock);
}
-static inline int ocfs2_is_hard_readonly(ocfs2_super *osb)
+static inline int ocfs2_is_hard_readonly(struct ocfs2_super *osb)
{
int ret;
@@ -326,7 +326,7 @@
return ret;
}
-static inline int ocfs2_is_soft_readonly(ocfs2_super *osb)
+static inline int ocfs2_is_soft_readonly(struct ocfs2_super *osb)
{
int ret;
Modified: branches/enotypedefs/fs/ocfs2/slot_map.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/slot_map.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/slot_map.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -53,7 +53,7 @@
* nodes. Should be holding an EX on super block. assumes slot info is
* up to date. Note that we call this *after* we find a slot, so our
* own node should be set in the map too... */
-void ocfs2_populate_mounted_map(ocfs2_super *osb)
+void ocfs2_populate_mounted_map(struct ocfs2_super *osb)
{
int i;
struct ocfs2_slot_info *si = osb->slot_info;
@@ -87,7 +87,7 @@
/* post the our slot info stuff into it's destination bh and write it
* out. */
-int ocfs2_update_disk_slots(ocfs2_super *osb,
+int ocfs2_update_disk_slots(struct ocfs2_super *osb,
struct ocfs2_slot_info *si)
{
int status, i;
@@ -167,7 +167,7 @@
spin_unlock(&si->si_lock);
}
-int ocfs2_init_slot_info(ocfs2_super *osb)
+int ocfs2_init_slot_info(struct ocfs2_super *osb)
{
int status, i;
u64 blkno;
@@ -228,7 +228,7 @@
kfree(si);
}
-int ocfs2_find_slot(ocfs2_super *osb)
+int ocfs2_find_slot(struct ocfs2_super *osb)
{
int status;
s16 slot;
@@ -275,7 +275,7 @@
return status;
}
-void ocfs2_put_slot(ocfs2_super *osb)
+void ocfs2_put_slot(struct ocfs2_super *osb)
{
int status;
struct ocfs2_slot_info *si = osb->slot_info;
Modified: branches/enotypedefs/fs/ocfs2/slot_map.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/slot_map.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/slot_map.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -37,14 +37,14 @@
s16 si_global_node_nums[OCFS2_MAX_SLOTS];
};
-int ocfs2_init_slot_info(ocfs2_super *osb);
+int ocfs2_init_slot_info(struct ocfs2_super *osb);
void ocfs2_free_slot_info(struct ocfs2_slot_info *si);
-int ocfs2_find_slot(ocfs2_super *osb);
-void ocfs2_put_slot(ocfs2_super *osb);
+int ocfs2_find_slot(struct ocfs2_super *osb);
+void ocfs2_put_slot(struct ocfs2_super *osb);
void ocfs2_update_slot_info(struct ocfs2_slot_info *si);
-int ocfs2_update_disk_slots(ocfs2_super *osb,
+int ocfs2_update_disk_slots(struct ocfs2_super *osb,
struct ocfs2_slot_info *si);
s16 ocfs2_node_num_to_slot(struct ocfs2_slot_info *si,
@@ -52,7 +52,7 @@
void ocfs2_clear_slot(struct ocfs2_slot_info *si,
s16 slot_num);
-void ocfs2_populate_mounted_map(ocfs2_super *osb);
+void ocfs2_populate_mounted_map(struct ocfs2_super *osb);
static inline int ocfs2_is_empty_slot(struct ocfs2_slot_info *si,
int slot_num)
Modified: branches/enotypedefs/fs/ocfs2/suballoc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/suballoc.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/suballoc.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -55,11 +55,11 @@
u64 group_blkno,
u16 my_chain,
struct ocfs2_chain_list *cl);
-static int ocfs2_block_group_alloc(ocfs2_super *osb,
+static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
struct inode *alloc_inode,
struct buffer_head *bh);
-static int ocfs2_reserve_suballoc_bits(ocfs2_super *osb,
+static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context *ac);
static int ocfs2_cluster_group_search(struct inode *inode,
@@ -76,7 +76,7 @@
u16 *bit_off,
unsigned int *num_bits,
u64 *bg_blkno);
-static int ocfs2_claim_suballoc_bits(ocfs2_super *osb,
+static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context *ac,
u32 bits_wanted,
u32 min_bits,
@@ -85,7 +85,7 @@
u64 *bg_blkno);
static int ocfs2_test_bg_bit_allocatable(struct buffer_head *bg_bh,
int nr);
-static int ocfs2_block_group_find_clear_bits(ocfs2_super *osb,
+static int ocfs2_block_group_find_clear_bits(struct ocfs2_super *osb,
struct buffer_head *bg_bh,
unsigned int bits_wanted,
u16 *bit_off,
@@ -217,7 +217,7 @@
/*
* We expect the block group allocator to already be locked.
*/
-static int ocfs2_block_group_alloc(ocfs2_super *osb,
+static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
struct inode *alloc_inode,
struct buffer_head *bh)
{
@@ -353,7 +353,7 @@
return status;
}
-static int ocfs2_reserve_suballoc_bits(ocfs2_super *osb,
+static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context *ac)
{
int status;
@@ -424,7 +424,7 @@
return status;
}
-int ocfs2_reserve_new_metadata(ocfs2_super *osb,
+int ocfs2_reserve_new_metadata(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_dinode *fe,
struct ocfs2_alloc_context **ac)
@@ -482,7 +482,7 @@
return status;
}
-int ocfs2_reserve_new_inode(ocfs2_super *osb,
+int ocfs2_reserve_new_inode(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context **ac)
{
@@ -535,7 +535,7 @@
/* local alloc code has to do the same thing, so rather than do this
* twice.. */
-int ocfs2_reserve_cluster_bitmap_bits(ocfs2_super *osb,
+int ocfs2_reserve_cluster_bitmap_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context *ac)
{
int status;
@@ -561,7 +561,7 @@
/* Callers don't need to care which bitmap (local alloc or main) to
* use so we figure it out for them, but unfortunately this clutters
* things a bit. */
-int ocfs2_reserve_clusters(ocfs2_super *osb,
+int ocfs2_reserve_clusters(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
u32 bits_wanted,
struct ocfs2_alloc_context **ac)
@@ -659,7 +659,7 @@
return !ocfs2_test_bit(nr, (unsigned long *)bg->bg_bitmap);
}
-static int ocfs2_block_group_find_clear_bits(ocfs2_super *osb,
+static int ocfs2_block_group_find_clear_bits(struct ocfs2_super *osb,
struct buffer_head *bg_bh,
unsigned int bits_wanted,
u16 *bit_off,
@@ -1107,7 +1107,7 @@
}
/* will give out up to bits_wanted contiguous bits. */
-static int ocfs2_claim_suballoc_bits(ocfs2_super *osb,
+static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context *ac,
u32 bits_wanted,
u32 min_bits,
@@ -1189,7 +1189,7 @@
return status;
}
-int ocfs2_claim_metadata(ocfs2_super *osb,
+int ocfs2_claim_metadata(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context *ac,
u32 bits_wanted,
@@ -1226,7 +1226,7 @@
return status;
}
-int ocfs2_claim_new_inode(ocfs2_super *osb,
+int ocfs2_claim_new_inode(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context *ac,
u16 *suballoc_bit,
@@ -1273,7 +1273,7 @@
u64 bg_blkno,
u16 bg_bit_off)
{
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
u32 cluster = 0;
BUG_ON(!ocfs2_is_cluster_bitmap(inode));
@@ -1289,7 +1289,7 @@
static inline u64 ocfs2_which_cluster_group(struct inode *inode,
u32 cluster)
{
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
u32 group_no;
BUG_ON(!ocfs2_is_cluster_bitmap(inode));
@@ -1308,7 +1308,7 @@
u64 *bg_blkno,
u16 *bg_bit_off)
{
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
u32 data_cluster = ocfs2_blocks_to_clusters(osb->sb, data_blkno);
BUG_ON(!ocfs2_is_cluster_bitmap(inode));
@@ -1329,7 +1329,7 @@
* contig. allocation, set to '1' to indicate we can deal with extents
* of any size.
*/
-int ocfs2_claim_clusters(ocfs2_super *osb,
+int ocfs2_claim_clusters(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context *ac,
u32 min_clusters,
@@ -1464,7 +1464,7 @@
{
int status = 0;
u32 tmp_used;
- ocfs2_super *osb = OCFS2_SB(alloc_inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(alloc_inode->i_sb);
struct ocfs2_dinode *fe = (struct ocfs2_dinode *) alloc_bh->b_data;
struct ocfs2_chain_list *cl = &fe->id2.i_chain;
struct buffer_head *group_bh = NULL;
Modified: branches/enotypedefs/fs/ocfs2/suballoc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/suballoc.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/suballoc.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -57,31 +57,31 @@
return ac->ac_bits_wanted - ac->ac_bits_given;
}
-int ocfs2_reserve_new_metadata(ocfs2_super *osb,
+int ocfs2_reserve_new_metadata(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_dinode *fe,
struct ocfs2_alloc_context **ac);
-int ocfs2_reserve_new_inode(ocfs2_super *osb,
+int ocfs2_reserve_new_inode(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context **ac);
-int ocfs2_reserve_clusters(ocfs2_super *osb,
+int ocfs2_reserve_clusters(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
u32 bits_wanted,
struct ocfs2_alloc_context **ac);
-int ocfs2_claim_metadata(ocfs2_super *osb,
+int ocfs2_claim_metadata(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct 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,
+int ocfs2_claim_new_inode(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context *ac,
u16 *suballoc_bit,
u64 *fe_blkno);
-int ocfs2_claim_clusters(ocfs2_super *osb,
+int ocfs2_claim_clusters(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context *ac,
u32 min_clusters,
@@ -102,7 +102,7 @@
u64 start_blk,
unsigned int num_clusters);
-static inline u32 ocfs2_cluster_from_desc(ocfs2_super *osb,
+static inline u32 ocfs2_cluster_from_desc(struct ocfs2_super *osb,
u64 bg_blkno)
{
/* This should work for all block group descriptors as only
@@ -120,13 +120,13 @@
static inline int ocfs2_is_cluster_bitmap(struct inode *inode)
{
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
return osb->bitmap_blkno == OCFS2_I(inode)->ip_blkno;
}
/* This is for local alloc ONLY. Others should use the task-specific
* apis above. */
-int ocfs2_reserve_cluster_bitmap_bits(ocfs2_super *osb,
+int ocfs2_reserve_cluster_bitmap_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context *ac);
#endif /* _CHAINALLOC_H_ */
Modified: branches/enotypedefs/fs/ocfs2/super.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/super.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/super.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -95,17 +95,17 @@
static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err);
static int ocfs2_initialize_mem_caches(void);
static void ocfs2_free_mem_caches(void);
-static void ocfs2_delete_osb(ocfs2_super *osb);
+static void ocfs2_delete_osb(struct ocfs2_super *osb);
static int ocfs2_statfs(struct super_block *sb, struct kstatfs *buf);
static int ocfs2_sync_fs(struct super_block *sb, int wait);
-static int ocfs2_init_global_system_inodes(ocfs2_super *osb);
-static int ocfs2_init_local_system_inodes(ocfs2_super *osb);
-static int ocfs2_release_system_inodes(ocfs2_super *osb);
-static int ocfs2_fill_local_node_info(ocfs2_super *osb);
-static int ocfs2_check_volume(ocfs2_super *osb);
+static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb);
+static int ocfs2_init_local_system_inodes(struct ocfs2_super *osb);
+static int ocfs2_release_system_inodes(struct ocfs2_super *osb);
+static int ocfs2_fill_local_node_info(struct ocfs2_super *osb);
+static int ocfs2_check_volume(struct ocfs2_super *osb);
static int ocfs2_verify_volume(struct ocfs2_dinode *di,
struct buffer_head *bh,
u32 sectsize);
@@ -185,7 +185,7 @@
{
int status = 0;
tid_t target;
- ocfs2_super *osb = OCFS2_SB(sb);
+ struct ocfs2_super *osb = OCFS2_SB(sb);
sb->s_dirt = 0;
@@ -208,7 +208,7 @@
return 0;
}
-static int ocfs2_init_global_system_inodes(ocfs2_super *osb)
+static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb)
{
struct inode *new = NULL;
int status = 0;
@@ -253,7 +253,7 @@
return status;
}
-static int ocfs2_init_local_system_inodes(ocfs2_super *osb)
+static int ocfs2_init_local_system_inodes(struct ocfs2_super *osb)
{
struct inode *new = NULL;
int status = 0;
@@ -281,7 +281,7 @@
return status;
}
-static int ocfs2_release_system_inodes(ocfs2_super *osb)
+static int ocfs2_release_system_inodes(struct ocfs2_super *osb)
{
int status = 0, i;
struct inode *inode;
@@ -369,7 +369,7 @@
int incompat_features;
int ret = 0;
unsigned long parsed_options;
- ocfs2_super *osb = OCFS2_SB(sb);
+ struct ocfs2_super *osb = OCFS2_SB(sb);
if (!ocfs2_parse_options(sb, data, &parsed_options, 1)) {
ret = -EINVAL;
@@ -528,7 +528,7 @@
int status, sector_size;
unsigned long parsed_opt;
struct inode *inode = NULL;
- ocfs2_super *osb = NULL;
+ struct ocfs2_super *osb = NULL;
struct buffer_head *bh = NULL;
mlog_entry("%p, %p, %i", sb, data, silent);
@@ -864,7 +864,7 @@
static int ocfs2_statfs(struct super_block *sb, struct kstatfs *buf)
{
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
u32 numbits, freebits;
int status;
struct ocfs2_dinode *bm_lock;
@@ -1015,7 +1015,7 @@
}
/* ocfs2 1.0 only allows one cluster and node identity per kernel image. */
-static int ocfs2_fill_local_node_info(ocfs2_super *osb)
+static int ocfs2_fill_local_node_info(struct ocfs2_super *osb)
{
int status;
@@ -1039,7 +1039,7 @@
{
int status = 0;
int unlock_super = 0;
- ocfs2_super *osb = OCFS2_SB(sb);
+ struct ocfs2_super *osb = OCFS2_SB(sb);
mlog_entry_void();
@@ -1126,7 +1126,7 @@
/* we can't grab the goofy sem lock from inside wait_event, so we use
* memory barriers to make sure that we'll see the null task before
* being woken up */
-static int ocfs2_recovery_thread_running(ocfs2_super *osb)
+static int ocfs2_recovery_thread_running(struct ocfs2_super *osb)
{
mb();
return osb->recovery_thread_task != NULL;
@@ -1135,7 +1135,7 @@
static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
{
int tmp;
- ocfs2_super *osb = NULL;
+ struct ocfs2_super *osb = NULL;
mlog_entry("(0x%p)\n", sb);
@@ -1206,7 +1206,7 @@
sb->s_fs_info = NULL;
}
-static int ocfs2_setup_osb_uuid(ocfs2_super *osb, const unsigned char *uuid,
+static int ocfs2_setup_osb_uuid(struct ocfs2_super *osb, const unsigned char *uuid,
unsigned uuid_bytes)
{
int i, ret;
@@ -1243,11 +1243,11 @@
struct buffer_head *bitmap_bh = NULL;
struct ocfs2_journal *journal;
__le32 uuid_net_key;
- ocfs2_super *osb;
+ struct ocfs2_super *osb;
mlog_entry_void();
- osb = kcalloc(1, sizeof(ocfs2_super), GFP_KERNEL);
+ osb = kcalloc(1, sizeof(struct ocfs2_super), GFP_KERNEL);
if (!osb) {
status = -ENOMEM;
mlog_errno(status);
@@ -1549,7 +1549,7 @@
return status;
}
-static int ocfs2_check_volume(ocfs2_super *osb)
+static int ocfs2_check_volume(struct ocfs2_super *osb)
{
int status = 0;
int dirty;
@@ -1633,7 +1633,7 @@
* It will remove the osb from the global list and also free up all the
* initialized resources and fileobject.
*/
-static void ocfs2_delete_osb(ocfs2_super *osb)
+static void ocfs2_delete_osb(struct ocfs2_super *osb)
{
mlog_entry_void();
@@ -1651,7 +1651,7 @@
if (osb->local_alloc_copy)
kfree(osb->local_alloc_copy);
kfree(osb->uuid_str);
- memset(osb, 0, sizeof(ocfs2_super));
+ memset(osb, 0, sizeof(struct ocfs2_super));
mlog_exit_void();
}
@@ -1660,7 +1660,7 @@
* panic(). We do not support continue-on-error operation. */
static void ocfs2_handle_error(struct super_block *sb)
{
- ocfs2_super *osb = OCFS2_SB(sb);
+ struct ocfs2_super *osb = OCFS2_SB(sb);
if (osb->s_mount_opt & OCFS2_MOUNT_ERRORS_PANIC)
panic("OCFS2: (device %s): panic forced after error\n",
Modified: branches/enotypedefs/fs/ocfs2/super.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/super.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/super.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -28,7 +28,7 @@
extern struct workqueue_struct *ocfs2_wq;
-int ocfs2_publish_get_mount_state(ocfs2_super *osb,
+int ocfs2_publish_get_mount_state(struct ocfs2_super *osb,
int node_num);
void __ocfs2_error(struct super_block *sb,
Modified: branches/enotypedefs/fs/ocfs2/symlink.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/symlink.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/symlink.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -213,7 +213,7 @@
unsigned int l;
char buf[10];
struct inode *inode = data;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
l = sprintf(buf, "%lu", (unsigned long)osb->node_num);
Modified: branches/enotypedefs/fs/ocfs2/sysfile.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/sysfile.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/sysfile.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -41,12 +41,12 @@
#include "buffer_head_io.h"
-static struct inode * _ocfs2_get_system_file_inode(ocfs2_super *osb,
+static struct inode * _ocfs2_get_system_file_inode(struct ocfs2_super *osb,
int type,
u32 slot);
static inline int is_global_system_inode(int type);
-static inline int is_in_system_inode_array(ocfs2_super *osb,
+static inline int is_in_system_inode_array(struct ocfs2_super *osb,
int type,
u32 slot);
@@ -56,14 +56,14 @@
type <= OCFS2_LAST_GLOBAL_SYSTEM_INODE;
}
-static inline int is_in_system_inode_array(ocfs2_super *osb,
+static inline int is_in_system_inode_array(struct ocfs2_super *osb,
int type,
u32 slot)
{
return slot == osb->slot_num || is_global_system_inode(type);
}
-struct inode *ocfs2_get_system_file_inode(ocfs2_super *osb,
+struct inode *ocfs2_get_system_file_inode(struct ocfs2_super *osb,
int type,
u32 slot)
{
@@ -95,7 +95,7 @@
return inode;
}
-static struct inode * _ocfs2_get_system_file_inode(ocfs2_super *osb,
+static struct inode * _ocfs2_get_system_file_inode(struct ocfs2_super *osb,
int type,
u32 slot)
{
Modified: branches/enotypedefs/fs/ocfs2/sysfile.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/sysfile.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/sysfile.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -26,7 +26,7 @@
#ifndef OCFS2_SYSFILE_H
#define OCFS2_SYSFILE_H
-struct inode * ocfs2_get_system_file_inode(ocfs2_super *osb,
+struct inode * ocfs2_get_system_file_inode(struct ocfs2_super *osb,
int type,
u32 slot);
Modified: branches/enotypedefs/fs/ocfs2/vote.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/vote.c 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/vote.c 2005-11-08 22:27:18 UTC (rev 2685)
@@ -132,7 +132,7 @@
struct ocfs2_net_response_cb *n_callback;
};
-static void ocfs2_process_mount_request(ocfs2_super *osb,
+static void ocfs2_process_mount_request(struct ocfs2_super *osb,
unsigned int node_num)
{
mlog(0, "MOUNT vote from node %u\n", node_num);
@@ -148,7 +148,7 @@
ocfs2_node_map_clear_bit(osb, &osb->umount_map, node_num);
}
-static void ocfs2_process_umount_request(ocfs2_super *osb,
+static void ocfs2_process_umount_request(struct ocfs2_super *osb,
unsigned int node_num)
{
mlog(0, "UMOUNT vote from node %u\n", node_num);
@@ -364,7 +364,7 @@
}
}
-static void ocfs2_process_vote(ocfs2_super *osb,
+static void ocfs2_process_vote(struct ocfs2_super *osb,
struct ocfs2_vote_msg *msg)
{
int net_status, vote_response;
@@ -497,7 +497,7 @@
iput(inode);
}
-static void ocfs2_vote_thread_do_work(ocfs2_super *osb)
+static void ocfs2_vote_thread_do_work(struct ocfs2_super *osb)
{
unsigned long processed;
struct ocfs2_lock_res *lockres;
@@ -546,7 +546,7 @@
mlog_exit_void();
}
-static int ocfs2_vote_thread_lists_empty(ocfs2_super *osb)
+static int ocfs2_vote_thread_lists_empty(struct ocfs2_super *osb)
{
int empty = 0;
@@ -559,7 +559,7 @@
return empty;
}
-static int ocfs2_vote_thread_should_wake(ocfs2_super *osb)
+static int ocfs2_vote_thread_should_wake(struct ocfs2_super *osb)
{
int should_wake = 0;
@@ -574,7 +574,7 @@
int ocfs2_vote_thread(void *arg)
{
int status = 0;
- ocfs2_super *osb = arg;
+ struct ocfs2_super *osb = arg;
/* only quit once we've been asked to stop and there is no more
* work available */
@@ -613,7 +613,7 @@
return w;
}
-static unsigned int ocfs2_new_response_id(ocfs2_super *osb)
+static unsigned int ocfs2_new_response_id(struct ocfs2_super *osb)
{
unsigned int ret;
@@ -624,7 +624,7 @@
return ret;
}
-static void ocfs2_dequeue_net_wait_ctxt(ocfs2_super *osb,
+static void ocfs2_dequeue_net_wait_ctxt(struct ocfs2_super *osb,
struct ocfs2_net_wait_ctxt *w)
{
spin_lock(&osb->net_response_lock);
@@ -632,7 +632,7 @@
spin_unlock(&osb->net_response_lock);
}
-static void ocfs2_queue_net_wait_ctxt(ocfs2_super *osb,
+static void ocfs2_queue_net_wait_ctxt(struct ocfs2_super *osb,
struct ocfs2_net_wait_ctxt *w)
{
spin_lock(&osb->net_response_lock);
@@ -641,7 +641,7 @@
spin_unlock(&osb->net_response_lock);
}
-static void __ocfs2_mark_node_responded(ocfs2_super *osb,
+static void __ocfs2_mark_node_responded(struct ocfs2_super *osb,
struct ocfs2_net_wait_ctxt *w,
int node_num)
{
@@ -654,7 +654,7 @@
/* Intended to be called from the node down callback, we fake remove
* the node from all our response contexts */
-void ocfs2_remove_node_from_vote_queues(ocfs2_super *osb,
+void ocfs2_remove_node_from_vote_queues(struct ocfs2_super *osb,
int node_num)
{
struct list_head *p;
@@ -671,7 +671,7 @@
spin_unlock(&osb->net_response_lock);
}
-static int ocfs2_broadcast_vote(ocfs2_super *osb,
+static int ocfs2_broadcast_vote(struct ocfs2_super *osb,
struct ocfs2_vote_msg *request,
unsigned int response_id,
int *response,
@@ -750,7 +750,7 @@
return status;
}
-static struct ocfs2_vote_msg * ocfs2_new_vote_request(ocfs2_super *osb,
+static struct ocfs2_vote_msg * ocfs2_new_vote_request(struct ocfs2_super *osb,
u64 blkno,
unsigned int generation,
enum ocfs2_vote_request type,
@@ -779,7 +779,7 @@
/* Complete the buildup of a new vote request and process the
* broadcast return value. */
-static int ocfs2_do_request_vote(ocfs2_super *osb,
+static int ocfs2_do_request_vote(struct ocfs2_super *osb,
struct ocfs2_vote_msg *request,
struct ocfs2_net_response_cb *callback)
{
@@ -810,7 +810,7 @@
struct ocfs2_net_response_cb *callback)
{
int status;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
if (ocfs2_inode_is_new(inode))
return 0;
@@ -874,7 +874,7 @@
{
int orphaned_slot, status;
struct ocfs2_net_response_cb delete_cb;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_vote_msg *request;
spin_lock(&OCFS2_I(inode)->ip_lock);
@@ -925,7 +925,7 @@
unsigned int nlink)
{
int status;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_vote_msg *request;
if (dentry->d_name.len > OCFS2_VOTE_FILENAME_LEN)
@@ -949,7 +949,7 @@
struct dentry *dentry)
{
int status;
- ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_vote_msg *request;
if (dentry->d_name.len > OCFS2_VOTE_FILENAME_LEN)
@@ -969,7 +969,7 @@
return status;
}
-int ocfs2_request_mount_vote(ocfs2_super *osb)
+int ocfs2_request_mount_vote(struct ocfs2_super *osb)
{
int status;
struct ocfs2_vote_msg *request = NULL;
@@ -1005,7 +1005,7 @@
return status;
}
-int ocfs2_request_umount_vote(ocfs2_super *osb)
+int ocfs2_request_umount_vote(struct ocfs2_super *osb)
{
int status;
struct ocfs2_vote_msg *request = NULL;
@@ -1039,7 +1039,7 @@
}
/* TODO: This should eventually be a hash table! */
-static struct ocfs2_net_wait_ctxt * __ocfs2_find_net_wait_ctxt(ocfs2_super *osb,
+static struct ocfs2_net_wait_ctxt * __ocfs2_find_net_wait_ctxt(struct ocfs2_super *osb,
u32 response_id)
{
struct list_head *p;
@@ -1082,7 +1082,7 @@
{
unsigned int response_id, node_num;
int response_status;
- ocfs2_super *osb = data;
+ struct ocfs2_super *osb = data;
struct ocfs2_response_msg *resp;
struct ocfs2_net_wait_ctxt * w;
struct ocfs2_net_response_cb *resp_cb;
@@ -1136,7 +1136,7 @@
void *data)
{
int status;
- ocfs2_super *osb = data;
+ struct ocfs2_super *osb = data;
struct ocfs2_vote_work *work;
work = kmalloc(sizeof(struct ocfs2_vote_work), GFP_KERNEL);
@@ -1173,7 +1173,7 @@
return status;
}
-void ocfs2_unregister_net_handlers(ocfs2_super *osb)
+void ocfs2_unregister_net_handlers(struct ocfs2_super *osb)
{
if (!osb->net_key)
return;
@@ -1186,7 +1186,7 @@
osb->net_key = 0;
}
-int ocfs2_register_net_handlers(ocfs2_super *osb)
+int ocfs2_register_net_handlers(struct ocfs2_super *osb)
{
int status = 0;
Modified: branches/enotypedefs/fs/ocfs2/vote.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/vote.h 2005-11-08 22:10:43 UTC (rev 2684)
+++ branches/enotypedefs/fs/ocfs2/vote.h 2005-11-08 22:27:18 UTC (rev 2685)
@@ -28,7 +28,7 @@
#define VOTE_H
int ocfs2_vote_thread(void *arg);
-static inline void ocfs2_kick_vote_thread(ocfs2_super *osb)
+static inline void ocfs2_kick_vote_thread(struct ocfs2_super *osb)
{
spin_lock(&osb->vote_task_lock);
/* make sure the voting thread gets a swipe at whatever changes
@@ -44,13 +44,13 @@
unsigned int nlink);
int ocfs2_request_rename_vote(struct inode *inode,
struct dentry *dentry);
-int ocfs2_request_mount_vote(ocfs2_super *osb);
-int ocfs2_request_umount_vote(ocfs2_super *osb);
-int ocfs2_register_net_handlers(ocfs2_super *osb);
-void ocfs2_unregister_net_handlers(ocfs2_super *osb);
+int ocfs2_request_mount_vote(struct ocfs2_super *osb);
+int ocfs2_request_umount_vote(struct ocfs2_super *osb);
+int ocfs2_register_net_handlers(struct ocfs2_super *osb);
+void ocfs2_unregister_net_handlers(struct ocfs2_super *osb);
void ocfs2_mark_inode_remotely_deleted(struct inode *inode);
-void ocfs2_remove_node_from_vote_queues(ocfs2_super *osb,
+void ocfs2_remove_node_from_vote_queues(struct ocfs2_super *osb,
int node_num);
#endif
More information about the Ocfs2-commits
mailing list