[Ocfs2-commits] jlbec commits r2682 - branches/enotypedefs/fs/ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Nov 8 15:43:00 CST 2005
Author: jlbec
Date: 2005-11-08 15:42:56 -0600 (Tue, 08 Nov 2005)
New Revision: 2682
Modified:
branches/enotypedefs/fs/ocfs2/alloc.c
branches/enotypedefs/fs/ocfs2/alloc.h
branches/enotypedefs/fs/ocfs2/aops.c
branches/enotypedefs/fs/ocfs2/dir.c
branches/enotypedefs/fs/ocfs2/dlmglue.c
branches/enotypedefs/fs/ocfs2/extent_map.c
branches/enotypedefs/fs/ocfs2/extent_map.h
branches/enotypedefs/fs/ocfs2/file.c
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/ocfs2.h
branches/enotypedefs/fs/ocfs2/ocfs2_fs.h
branches/enotypedefs/fs/ocfs2/suballoc.c
branches/enotypedefs/fs/ocfs2/suballoc.h
branches/enotypedefs/fs/ocfs2/super.c
branches/enotypedefs/fs/ocfs2/symlink.c
Log:
o Remove typedefs from on-disk structures.
Modified: branches/enotypedefs/fs/ocfs2/alloc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/alloc.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/alloc.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -48,7 +48,7 @@
#include "buffer_head_io.h"
static int ocfs2_extent_contig(struct inode *inode,
- ocfs2_extent_rec *ext,
+ struct ocfs2_extent_rec *ext,
u64 blkno);
static int ocfs2_create_new_meta_bhs(ocfs2_super *osb,
@@ -87,7 +87,7 @@
static int ocfs2_find_new_last_ext_blk(ocfs2_super *osb,
struct inode *inode,
- ocfs2_dinode *fe,
+ struct ocfs2_dinode *fe,
unsigned int new_i_clusters,
struct buffer_head *old_last_eb,
struct buffer_head **new_last_eb);
@@ -95,7 +95,7 @@
static void ocfs2_free_truncate_context(struct ocfs2_truncate_context *tc);
static int ocfs2_extent_contig(struct inode *inode,
- ocfs2_extent_rec *ext,
+ struct ocfs2_extent_rec *ext,
u64 blkno)
{
return blkno == (le64_to_cpu(ext->e_blkno) +
@@ -108,11 +108,11 @@
*/
int ocfs2_num_free_extents(ocfs2_super *osb,
struct inode *inode,
- ocfs2_dinode *fe)
+ struct ocfs2_dinode *fe)
{
int retval;
- ocfs2_extent_list *el;
- ocfs2_extent_block *eb;
+ struct ocfs2_extent_list *el;
+ struct ocfs2_extent_block *eb;
struct buffer_head *eb_bh = NULL;
mlog_entry_void();
@@ -130,7 +130,7 @@
mlog_errno(retval);
goto bail;
}
- eb = (ocfs2_extent_block *) eb_bh->b_data;
+ eb = (struct ocfs2_extent_block *) eb_bh->b_data;
el = &eb->h_list;
} else
el = &fe->id2.i_list;
@@ -162,7 +162,7 @@
u16 suballoc_bit_start;
u32 num_got;
u64 first_blkno;
- ocfs2_extent_block *eb;
+ struct ocfs2_extent_block *eb;
mlog_entry_void();
@@ -197,7 +197,7 @@
}
memset(bhs[i]->b_data, 0, osb->sb->s_blocksize);
- eb = (ocfs2_extent_block *) bhs[i]->b_data;
+ eb = (struct ocfs2_extent_block *) bhs[i]->b_data;
/* Ok, setup the minimal stuff here. */
strcpy(eb->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE);
eb->h_blkno = cpu_to_le64(first_blkno);
@@ -264,19 +264,19 @@
u64 next_blkno, new_last_eb_blk;
struct buffer_head *bh;
struct buffer_head **new_eb_bhs = NULL;
- ocfs2_dinode *fe;
- ocfs2_extent_block *eb;
- ocfs2_extent_list *eb_el;
- ocfs2_extent_list *el;
+ struct ocfs2_dinode *fe;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_extent_list *eb_el;
+ struct ocfs2_extent_list *el;
mlog_entry_void();
BUG_ON(!last_eb_bh);
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
if (eb_bh) {
- eb = (ocfs2_extent_block *) eb_bh->b_data;
+ eb = (struct ocfs2_extent_block *) eb_bh->b_data;
el = &eb->h_list;
} else
el = &fe->id2.i_list;
@@ -312,7 +312,7 @@
next_blkno = new_last_eb_blk = 0;
for(i = 0; i < new_blocks; i++) {
bh = new_eb_bhs[i];
- eb = (ocfs2_extent_block *) bh->b_data;
+ eb = (struct ocfs2_extent_block *) bh->b_data;
if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
OCFS2_RO_ON_INVALID_EXTENT_BLOCK(inode->i_sb, eb);
status = -EIO;
@@ -384,7 +384,7 @@
* next_leaf on the previously last-extent-block. */
fe->i_last_eb_blk = cpu_to_le64(new_last_eb_blk);
- eb = (ocfs2_extent_block *) last_eb_bh->b_data;
+ eb = (struct ocfs2_extent_block *) last_eb_bh->b_data;
eb->h_next_leaf_blk = cpu_to_le64(new_last_eb_blk);
status = ocfs2_journal_dirty(handle, last_eb_bh);
@@ -426,10 +426,10 @@
{
int status, i;
struct buffer_head *new_eb_bh = NULL;
- ocfs2_dinode *fe;
- ocfs2_extent_block *eb;
- ocfs2_extent_list *fe_el;
- ocfs2_extent_list *eb_el;
+ struct ocfs2_dinode *fe;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_extent_list *fe_el;
+ struct ocfs2_extent_list *eb_el;
mlog_entry_void();
@@ -440,7 +440,7 @@
goto bail;
}
- eb = (ocfs2_extent_block *) new_eb_bh->b_data;
+ eb = (struct ocfs2_extent_block *) new_eb_bh->b_data;
if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
OCFS2_RO_ON_INVALID_EXTENT_BLOCK(inode->i_sb, eb);
status = -EIO;
@@ -448,7 +448,7 @@
}
eb_el = &eb->h_list;
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
fe_el = &fe->id2.i_list;
status = ocfs2_journal_access(handle, inode, new_eb_bh,
@@ -530,9 +530,9 @@
u64 next_blkno;
u16 next_free;
struct buffer_head **eb_bhs = NULL;
- ocfs2_dinode *fe;
- ocfs2_extent_block *eb;
- ocfs2_extent_list *el;
+ struct ocfs2_dinode *fe;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_extent_list *el;
mlog_entry_void();
@@ -543,7 +543,7 @@
goto bail;
}
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
el = &fe->id2.i_list;
if (el->l_tree_depth) {
/* This is another operation where we want to be
@@ -581,7 +581,7 @@
mlog_errno(status);
goto bail;
}
- eb = (ocfs2_extent_block *) eb_bhs[i]->b_data;
+ eb = (struct ocfs2_extent_block *) eb_bhs[i]->b_data;
if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
OCFS2_RO_ON_INVALID_EXTENT_BLOCK(inode->i_sb,
eb);
@@ -621,7 +621,7 @@
new_clusters);
/* (num_bhs - 1) to avoid the leaf */
for(i = 0; i < (num_bhs - 1); i++) {
- eb = (ocfs2_extent_block *) eb_bhs[i]->b_data;
+ eb = (struct ocfs2_extent_block *) eb_bhs[i]->b_data;
el = &eb->h_list;
/* finally, make our actual change to the
@@ -637,7 +637,7 @@
BUG_ON(i != (num_bhs - 1));
/* note that the leaf block wasn't touched in
* the loop above */
- eb = (ocfs2_extent_block *) eb_bhs[num_bhs - 1]->b_data;
+ eb = (struct ocfs2_extent_block *) eb_bhs[num_bhs - 1]->b_data;
el = &eb->h_list;
BUG_ON(el->l_tree_depth);
}
@@ -732,9 +732,9 @@
{
int status = 0, i;
u64 blkno;
- ocfs2_dinode *fe;
- ocfs2_extent_block *eb;
- ocfs2_extent_list *el;
+ struct ocfs2_dinode *fe;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_extent_list *el;
struct buffer_head *bh = NULL;
struct buffer_head *lowest_bh = NULL;
@@ -742,7 +742,7 @@
*target_bh = NULL;
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
el = &fe->id2.i_list;
while(le16_to_cpu(el->l_tree_depth) > 1) {
@@ -776,7 +776,7 @@
goto bail;
}
- eb = (ocfs2_extent_block *) bh->b_data;
+ eb = (struct ocfs2_extent_block *) bh->b_data;
if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
OCFS2_RO_ON_INVALID_EXTENT_BLOCK(inode->i_sb, eb);
status = -EIO;
@@ -820,9 +820,9 @@
int status, i, shift;
struct buffer_head *last_eb_bh = NULL;
struct buffer_head *bh = NULL;
- ocfs2_dinode *fe;
- ocfs2_extent_block *eb;
- ocfs2_extent_list *el;
+ struct ocfs2_dinode *fe;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_extent_list *el;
mlog_entry_void();
@@ -830,7 +830,7 @@
"inode %"MLFu64"\n",
new_clusters, start_blk, OCFS2_I(inode)->ip_blkno);
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
el = &fe->id2.i_list;
if (el->l_tree_depth) {
@@ -841,7 +841,7 @@
mlog_exit(status);
goto bail;
}
- eb = (ocfs2_extent_block *) last_eb_bh->b_data;
+ eb = (struct ocfs2_extent_block *) last_eb_bh->b_data;
el = &eb->h_list;
}
@@ -921,10 +921,10 @@
static inline int ocfs2_truncate_log_needs_flush(ocfs2_super *osb)
{
struct buffer_head *tl_bh = osb->osb_tl_bh;
- ocfs2_dinode *di;
- ocfs2_truncate_log *tl;
+ struct ocfs2_dinode *di;
+ struct ocfs2_truncate_log *tl;
- di = (ocfs2_dinode *) tl_bh->b_data;
+ di = (struct ocfs2_dinode *) tl_bh->b_data;
tl = &di->id2.i_dealloc;
mlog_bug_on_msg(le16_to_cpu(tl->tl_used) > le16_to_cpu(tl->tl_count),
@@ -934,7 +934,7 @@
return le16_to_cpu(tl->tl_used) == le16_to_cpu(tl->tl_count);
}
-static int ocfs2_truncate_log_can_coalesce(ocfs2_truncate_log *tl,
+static int ocfs2_truncate_log_can_coalesce(struct ocfs2_truncate_log *tl,
unsigned int new_start)
{
unsigned int tail_index;
@@ -960,8 +960,8 @@
unsigned int start_cluster, tl_count;
struct inode *tl_inode = osb->osb_tl_inode;
struct buffer_head *tl_bh = osb->osb_tl_bh;
- ocfs2_dinode *di;
- ocfs2_truncate_log *tl;
+ struct ocfs2_dinode *di;
+ struct ocfs2_truncate_log *tl;
mlog_entry("start_blk = %"MLFu64", num_clusters = %u\n", start_blk,
num_clusters);
@@ -970,7 +970,7 @@
start_cluster = ocfs2_blocks_to_clusters(osb->sb, start_blk);
- di = (ocfs2_dinode *) tl_bh->b_data;
+ di = (struct ocfs2_dinode *) tl_bh->b_data;
tl = &di->id2.i_dealloc;
if (!OCFS2_IS_VALID_DINODE(di)) {
OCFS2_RO_ON_INVALID_DINODE(osb->sb, di);
@@ -1042,15 +1042,15 @@
int i;
unsigned int num_clusters;
u64 start_blk;
- ocfs2_truncate_rec rec;
- ocfs2_dinode *di;
- ocfs2_truncate_log *tl;
+ struct ocfs2_truncate_rec rec;
+ struct ocfs2_dinode *di;
+ struct ocfs2_truncate_log *tl;
struct inode *tl_inode = osb->osb_tl_inode;
struct buffer_head *tl_bh = osb->osb_tl_bh;
mlog_entry_void();
- di = (ocfs2_dinode *) tl_bh->b_data;
+ di = (struct ocfs2_dinode *) tl_bh->b_data;
tl = &di->id2.i_dealloc;
i = le16_to_cpu(tl->tl_used) - 1;
while (i >= 0) {
@@ -1118,14 +1118,14 @@
struct inode *data_alloc_inode = NULL;
struct buffer_head *tl_bh = osb->osb_tl_bh;
struct buffer_head *data_alloc_bh = NULL;
- ocfs2_dinode *di;
- ocfs2_truncate_log *tl;
+ struct ocfs2_dinode *di;
+ struct ocfs2_truncate_log *tl;
mlog_entry_void();
BUG_ON(!down_trylock(&tl_inode->i_sem));
- di = (ocfs2_dinode *) tl_bh->b_data;
+ di = (struct ocfs2_dinode *) tl_bh->b_data;
tl = &di->id2.i_dealloc;
if (!OCFS2_IS_VALID_DINODE(di)) {
OCFS2_RO_ON_INVALID_DINODE(osb->sb, di);
@@ -1273,13 +1273,13 @@
* NULL. */
int ocfs2_begin_truncate_log_recovery(ocfs2_super *osb,
int slot_num,
- ocfs2_dinode **tl_copy)
+ struct ocfs2_dinode **tl_copy)
{
int status;
struct inode *tl_inode = NULL;
struct buffer_head *tl_bh = NULL;
- ocfs2_dinode *di;
- ocfs2_truncate_log *tl;
+ struct ocfs2_dinode *di;
+ struct ocfs2_truncate_log *tl;
*tl_copy = NULL;
@@ -1291,7 +1291,7 @@
goto bail;
}
- di = (ocfs2_dinode *) tl_bh->b_data;
+ di = (struct ocfs2_dinode *) tl_bh->b_data;
tl = &di->id2.i_dealloc;
if (!OCFS2_IS_VALID_DINODE(di)) {
OCFS2_RO_ON_INVALID_DINODE(tl_inode->i_sb, di);
@@ -1341,7 +1341,7 @@
}
int ocfs2_complete_truncate_log_recovery(ocfs2_super *osb,
- ocfs2_dinode *tl_copy)
+ struct ocfs2_dinode *tl_copy)
{
int status = 0;
int i;
@@ -1349,7 +1349,7 @@
u64 start_blk;
struct ocfs2_journal_handle *handle;
struct inode *tl_inode = osb->osb_tl_inode;
- ocfs2_truncate_log *tl;
+ struct ocfs2_truncate_log *tl;
mlog_entry_void();
@@ -1455,15 +1455,15 @@
* as the dinodes i_last_eb_blk */
static int ocfs2_find_new_last_ext_blk(ocfs2_super *osb,
struct inode *inode,
- ocfs2_dinode *fe,
+ 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;
- ocfs2_extent_block *eb;
- ocfs2_extent_list *el;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_extent_list *el;
struct buffer_head *bh = NULL;
*new_last_eb = NULL;
@@ -1483,7 +1483,7 @@
if (!new_i_clusters)
goto bail;
- eb = (ocfs2_extent_block *) old_last_eb->b_data;
+ eb = (struct ocfs2_extent_block *) old_last_eb->b_data;
el = &(eb->h_list);
BUG_ON(!el->l_next_free_rec);
@@ -1518,7 +1518,7 @@
mlog_errno(status);
goto bail;
}
- eb = (ocfs2_extent_block *) bh->b_data;
+ eb = (struct ocfs2_extent_block *) bh->b_data;
el = &eb->h_list;
if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
OCFS2_RO_ON_INVALID_EXTENT_BLOCK(inode->i_sb, eb);
@@ -1546,16 +1546,16 @@
struct ocfs2_truncate_context *tc)
{
int status, i, depth;
- ocfs2_dinode *fe;
- ocfs2_extent_block *eb;
- ocfs2_extent_block *last_eb = NULL;
- ocfs2_extent_list *el;
+ struct ocfs2_dinode *fe;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_extent_block *last_eb = NULL;
+ struct ocfs2_extent_list *el;
struct buffer_head *eb_bh = NULL;
struct buffer_head *last_eb_bh = NULL;
u64 next_eb = 0;
u64 delete_blk = 0;
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
status = ocfs2_find_new_last_ext_blk(osb,
inode,
@@ -1569,7 +1569,7 @@
goto bail;
}
if (last_eb_bh)
- last_eb = (ocfs2_extent_block *) last_eb_bh->b_data;
+ last_eb = (struct ocfs2_extent_block *) last_eb_bh->b_data;
status = ocfs2_journal_access(handle, inode, fe_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
@@ -1654,7 +1654,7 @@
mlog_errno(status);
goto bail;
}
- eb = (ocfs2_extent_block *)eb_bh->b_data;
+ eb = (struct ocfs2_extent_block *)eb_bh->b_data;
if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
OCFS2_RO_ON_INVALID_EXTENT_BLOCK(inode->i_sb, eb);
status = -EIO;
@@ -1765,9 +1765,9 @@
int status, i, credits, tl_sem = 0;
u32 clusters_to_del, target_i_clusters;
u64 last_eb = 0;
- ocfs2_dinode *fe;
- ocfs2_extent_block *eb;
- ocfs2_extent_list *el;
+ struct ocfs2_dinode *fe;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_extent_list *el;
struct buffer_head *last_eb_bh;
struct ocfs2_journal_handle *handle = NULL;
struct inode *tl_inode = osb->osb_tl_inode;
@@ -1782,10 +1782,10 @@
last_eb_bh = tc->tc_last_eb_bh;
tc->tc_last_eb_bh = NULL;
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
if (fe->id2.i_list.l_tree_depth) {
- eb = (ocfs2_extent_block *) last_eb_bh->b_data;
+ eb = (struct ocfs2_extent_block *) last_eb_bh->b_data;
el = &eb->h_list;
} else
el = &fe->id2.i_list;
@@ -1819,7 +1819,7 @@
mlog_errno(status);
goto bail;
}
- eb = (ocfs2_extent_block *) last_eb_bh->b_data;
+ eb = (struct ocfs2_extent_block *) last_eb_bh->b_data;
if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
OCFS2_RO_ON_INVALID_EXTENT_BLOCK(inode->i_sb, eb);
status = -EIO;
@@ -1918,9 +1918,9 @@
{
int status, metadata_delete;
unsigned int new_i_clusters;
- ocfs2_dinode *fe;
- ocfs2_extent_block *eb;
- ocfs2_extent_list *el;
+ struct ocfs2_dinode *fe;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_extent_list *el;
struct buffer_head *last_eb_bh = NULL;
struct inode *ext_alloc_inode = NULL;
struct buffer_head *ext_alloc_bh = NULL;
@@ -1931,7 +1931,7 @@
new_i_clusters = ocfs2_clusters_for_bytes(osb->sb,
i_size_read(inode));
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
mlog(0, "fe->i_clusters = %u, new_i_clusters = %u, fe->i_size ="
"%"MLFu64"\n", fe->i_clusters, new_i_clusters, fe->i_size);
@@ -1969,7 +1969,7 @@
mlog_errno(status);
goto bail;
}
- eb = (ocfs2_extent_block *) last_eb_bh->b_data;
+ eb = (struct ocfs2_extent_block *) last_eb_bh->b_data;
if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
OCFS2_RO_ON_INVALID_EXTENT_BLOCK(inode->i_sb, eb);
Modified: branches/enotypedefs/fs/ocfs2/alloc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/alloc.h 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/alloc.h 2005-11-08 21:42:56 UTC (rev 2682)
@@ -36,9 +36,9 @@
struct _ocfs2_alloc_context *meta_ac);
int ocfs2_num_free_extents(ocfs2_super *osb,
struct inode *inode,
- ocfs2_dinode *fe);
+ struct ocfs2_dinode *fe);
/* how many new metadata chunks would an allocation need at maximum? */
-static inline int ocfs2_extend_meta_needed(ocfs2_dinode *fe)
+static inline int ocfs2_extend_meta_needed(struct ocfs2_dinode *fe)
{
/*
* Rather than do all the work of determining how much we need
@@ -58,9 +58,9 @@
int ocfs2_flush_truncate_log(ocfs2_super *osb);
int ocfs2_begin_truncate_log_recovery(ocfs2_super *osb,
int slot_num,
- ocfs2_dinode **tl_copy);
+ struct ocfs2_dinode **tl_copy);
int ocfs2_complete_truncate_log_recovery(ocfs2_super *osb,
- ocfs2_dinode *tl_copy);
+ struct ocfs2_dinode *tl_copy);
struct ocfs2_truncate_context {
struct inode *tc_ext_alloc_inode;
Modified: branches/enotypedefs/fs/ocfs2/aops.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/aops.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/aops.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -47,7 +47,7 @@
{
int err = -EIO;
int status;
- ocfs2_dinode *fe = NULL;
+ 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);
@@ -71,7 +71,7 @@
mlog_errno(status);
goto bail;
}
- fe = (ocfs2_dinode *) bh->b_data;
+ fe = (struct ocfs2_dinode *) bh->b_data;
if (!OCFS2_IS_VALID_DINODE(fe)) {
mlog(ML_ERROR, "Invalid dinode #%"MLFu64": signature = %.*s\n",
@@ -441,7 +441,8 @@
if (extending) {
loff_t size = (u64) i_size_read(inode);
- ocfs2_dinode *di = (ocfs2_dinode *)di_bh->b_data;
+ struct ocfs2_dinode *di =
+ (struct ocfs2_dinode *)di_bh->b_data;
/* ocfs2_mark_inode_dirty is too heavy to use here. */
inode->i_blocks = ocfs2_align_bytes_to_sectors(size);
Modified: branches/enotypedefs/fs/ocfs2/dir.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dir.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/dir.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -395,7 +395,7 @@
int status = 0;
int credits, num_free_extents;
loff_t dir_i_size;
- ocfs2_dinode *fe = (ocfs2_dinode *) parent_fe_bh->b_data;
+ struct ocfs2_dinode *fe = (struct ocfs2_dinode *) parent_fe_bh->b_data;
ocfs2_alloc_context *data_ac = NULL;
ocfs2_alloc_context *meta_ac = NULL;
struct ocfs2_journal_handle *handle = NULL;
@@ -524,7 +524,7 @@
unsigned long offset;
struct buffer_head * bh = NULL;
unsigned short rec_len;
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
struct ocfs2_dir_entry *de;
struct super_block *sb;
int status;
@@ -535,7 +535,7 @@
namelen, OCFS2_I(dir)->ip_blkno);
BUG_ON(!S_ISDIR(dir->i_mode));
- fe = (ocfs2_dinode *) parent_fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) parent_fe_bh->b_data;
BUG_ON(le64_to_cpu(fe->i_size) != i_size_read(dir));
sb = dir->i_sb;
Modified: branches/enotypedefs/fs/ocfs2/dlmglue.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlmglue.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/dlmglue.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -1428,7 +1428,7 @@
int status = 0;
struct ocfs2_inode_info *oi = OCFS2_I(inode);
struct ocfs2_lock_res *lockres;
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
mlog_entry_void();
@@ -1469,7 +1469,7 @@
mlog_errno(status);
goto bail_refresh;
}
- fe = (ocfs2_dinode *) (*bh)->b_data;
+ fe = (struct ocfs2_dinode *) (*bh)->b_data;
/* This is a good chance to make sure we're not
* locking an invalid object.
Modified: branches/enotypedefs/fs/ocfs2/extent_map.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/extent_map.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/extent_map.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -49,7 +49,7 @@
struct ocfs2_extent_map_entry {
struct rb_node e_node;
int e_tree_depth;
- ocfs2_extent_rec e_rec;
+ struct ocfs2_extent_rec e_rec;
};
struct ocfs2_em_insert_context {
@@ -69,25 +69,26 @@
u32 cpos, u32 clusters,
struct rb_node ***ret_p,
struct rb_node **ret_parent);
-static int ocfs2_extent_map_insert(struct inode *inode, ocfs2_extent_rec *rec,
+static int ocfs2_extent_map_insert(struct inode *inode,
+ struct ocfs2_extent_rec *rec,
int tree_depth);
static int ocfs2_extent_map_insert_entry(struct ocfs2_extent_map *em,
struct ocfs2_extent_map_entry *ent);
static int ocfs2_extent_map_find_leaf(struct inode *inode,
u32 cpos, u32 clusters,
- ocfs2_extent_list *el);
+ struct ocfs2_extent_list *el);
static int ocfs2_extent_map_lookup_read(struct inode *inode,
u32 cpos, u32 clusters,
struct ocfs2_extent_map_entry **ret_ent);
static int ocfs2_extent_map_try_insert(struct inode *inode,
- ocfs2_extent_rec *rec,
+ struct ocfs2_extent_rec *rec,
int tree_depth,
struct ocfs2_em_insert_context *ctxt);
/* returns 1 only if the rec contains all the given clusters -- that is that
* rec's cpos is <= the cluster cpos and that the rec endpoint (cpos +
* clusters) is >= the argument's endpoint */
-static int ocfs2_extent_rec_contains_clusters(ocfs2_extent_rec *rec,
+static int ocfs2_extent_rec_contains_clusters(struct ocfs2_extent_rec *rec,
u32 cpos, u32 clusters)
{
if (le32_to_cpu(rec->e_cpos) > cpos)
@@ -155,14 +156,14 @@
*/
static int ocfs2_extent_map_find_leaf(struct inode *inode,
u32 cpos, u32 clusters,
- ocfs2_extent_list *el)
+ struct ocfs2_extent_list *el)
{
int i, ret;
struct buffer_head *eb_bh = NULL;
u64 blkno;
u32 rec_end;
- ocfs2_extent_block *eb;
- ocfs2_extent_rec *rec;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_extent_rec *rec;
/*
* The bh data containing the el cannot change here, because
@@ -238,7 +239,7 @@
inode);
if (ret)
goto out_free;
- eb = (ocfs2_extent_block *)eb_bh->b_data;
+ eb = (struct ocfs2_extent_block *)eb_bh->b_data;
if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
OCFS2_RO_ON_INVALID_EXTENT_BLOCK(inode->i_sb, eb);
ret = -EIO;
@@ -282,9 +283,9 @@
struct ocfs2_extent_map *em = &OCFS2_I(inode)->ip_map;
struct ocfs2_extent_map_entry *ent;
struct buffer_head *bh = NULL;
- ocfs2_extent_block *eb;
- ocfs2_dinode *di;
- ocfs2_extent_list *el;
+ struct ocfs2_extent_block *eb;
+ struct ocfs2_dinode *di;
+ struct ocfs2_extent_list *el;
spin_lock(&OCFS2_I(inode)->ip_lock);
ent = ocfs2_extent_map_lookup(em, cpos, clusters, NULL, NULL);
@@ -304,7 +305,7 @@
brelse(bh);
return ret;
}
- eb = (ocfs2_extent_block *)bh->b_data;
+ eb = (struct ocfs2_extent_block *)bh->b_data;
if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
OCFS2_RO_ON_INVALID_EXTENT_BLOCK(inode->i_sb, eb);
brelse(bh);
@@ -322,7 +323,7 @@
brelse(bh);
return ret;
}
- di = (ocfs2_dinode *)bh->b_data;
+ di = (struct ocfs2_dinode *)bh->b_data;
if (!OCFS2_IS_VALID_DINODE(di)) {
brelse(bh);
OCFS2_RO_ON_INVALID_DINODE(inode->i_sb, di);
@@ -376,7 +377,7 @@
* in the insert_context will be freed.
*/
static int ocfs2_extent_map_try_insert(struct inode *inode,
- ocfs2_extent_rec *rec,
+ struct ocfs2_extent_rec *rec,
int tree_depth,
struct ocfs2_em_insert_context *ctxt)
{
@@ -408,7 +409,7 @@
if (old_ent->e_tree_depth == tree_depth) {
if (!memcmp(rec, &old_ent->e_rec,
- sizeof(ocfs2_extent_rec)))
+ sizeof(struct ocfs2_extent_rec)))
ret = 0;
/* FIXME: Should this be ESRCH/EBADR??? */
@@ -484,7 +485,8 @@
}
-static int ocfs2_extent_map_insert(struct inode *inode, ocfs2_extent_rec *rec,
+static int ocfs2_extent_map_insert(struct inode *inode,
+ struct ocfs2_extent_rec *rec,
int tree_depth)
{
int ret;
@@ -567,13 +569,14 @@
* rec->e_clusters. If the append is an entirely new extent, then
* rec->e_clusters is == new_clusters.
*/
-int ocfs2_extent_map_append(struct inode *inode, ocfs2_extent_rec *rec,
+int ocfs2_extent_map_append(struct inode *inode,
+ struct ocfs2_extent_rec *rec,
u32 new_clusters)
{
int ret;
struct ocfs2_extent_map *em = &OCFS2_I(inode)->ip_map;
struct ocfs2_extent_map_entry *ent;
- ocfs2_extent_rec *old;
+ struct ocfs2_extent_rec *old;
BUG_ON(!new_clusters);
BUG_ON(le32_to_cpu(rec->e_clusters) < new_clusters);
@@ -656,7 +659,7 @@
* dropped. After that, truncate and extend can happen. Caveat Emptor.
*/
int ocfs2_extent_map_get_rec(struct inode *inode, u32 cpos,
- ocfs2_extent_rec **rec,
+ struct ocfs2_extent_rec **rec,
int *tree_depth)
{
int ret = -ENOENT;
@@ -754,7 +757,7 @@
int bpc = ocfs2_clusters_to_blocks(inode->i_sb, 1);
struct ocfs2_extent_map_entry *ent = NULL;
struct ocfs2_extent_map *em = &OCFS2_I(inode)->ip_map;
- ocfs2_extent_rec *rec;
+ struct ocfs2_extent_rec *rec;
*p_blkno = 0;
Modified: branches/enotypedefs/fs/ocfs2/extent_map.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/extent_map.h 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/extent_map.h 2005-11-08 21:42:56 UTC (rev 2682)
@@ -34,7 +34,8 @@
* in the process of being updated.
*/
int ocfs2_extent_map_init(struct inode *inode);
-int ocfs2_extent_map_append(struct inode *inode, ocfs2_extent_rec *rec,
+int ocfs2_extent_map_append(struct inode *inode,
+ struct ocfs2_extent_rec *rec,
u32 new_clusters);
int ocfs2_extent_map_get_blocks(struct inode *inode,
u64 v_blkno, int count,
Modified: branches/enotypedefs/fs/ocfs2/file.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/file.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/file.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -227,7 +227,7 @@
u64 new_i_size)
{
int status = 0;
- ocfs2_dinode *fe = NULL;
+ struct ocfs2_dinode *fe = NULL;
ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_truncate_context *tc = NULL;
@@ -236,7 +236,7 @@
truncate_inode_pages(inode->i_mapping, new_i_size);
- fe = (ocfs2_dinode *) di_bh->b_data;
+ fe = (struct ocfs2_dinode *) di_bh->b_data;
if (!OCFS2_IS_VALID_DINODE(fe)) {
OCFS2_RO_ON_INVALID_DINODE(inode->i_sb, fe);
status = -EIO;
@@ -337,7 +337,7 @@
{
int status = 0;
int free_extents;
- ocfs2_dinode *fe = (ocfs2_dinode *) fe_bh->b_data;
+ struct ocfs2_dinode *fe = (struct ocfs2_dinode *) fe_bh->b_data;
enum ocfs2_alloc_restarted reason = RESTART_NONE;
u32 bit_off, num_bits;
u64 block;
@@ -434,7 +434,7 @@
int credits, num_free_extents;
u32 prev_clusters;
struct buffer_head *bh = NULL;
- ocfs2_dinode *fe = NULL;
+ struct ocfs2_dinode *fe = NULL;
struct ocfs2_journal_handle *handle = NULL;
ocfs2_alloc_context *data_ac = NULL;
ocfs2_alloc_context *meta_ac = NULL;
@@ -450,7 +450,7 @@
goto leave;
}
- fe = (ocfs2_dinode *) bh->b_data;
+ fe = (struct ocfs2_dinode *) bh->b_data;
if (!OCFS2_IS_VALID_DINODE(fe)) {
OCFS2_RO_ON_INVALID_DINODE(inode->i_sb, fe);
status = -EIO;
Modified: branches/enotypedefs/fs/ocfs2/inode.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/inode.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/inode.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -211,7 +211,7 @@
return 0;
}
-int ocfs2_populate_inode(struct inode *inode, ocfs2_dinode *fe,
+int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
int create_ino)
{
struct super_block *sb;
@@ -337,7 +337,7 @@
{
struct super_block *sb;
ocfs2_super *osb;
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
struct buffer_head *bh = NULL;
int status;
int sysfile = 0;
@@ -368,7 +368,7 @@
goto bail;
}
- fe = (ocfs2_dinode *) bh->b_data;
+ fe = (struct ocfs2_dinode *) bh->b_data;
if (!OCFS2_IS_VALID_DINODE(fe)) {
mlog(ML_ERROR, "Invalid dinode #%"MLFu64": signature = %.*s\n",
fe->i_blkno, 7, fe->i_signature);
@@ -418,11 +418,11 @@
int status = 0;
struct ocfs2_journal_handle *handle = NULL;
struct ocfs2_truncate_context *tc = NULL;
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
mlog_entry_void();
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
/* zero allocation, zero truncate :) */
if (!fe->i_clusters)
@@ -474,7 +474,7 @@
struct buffer_head *inode_alloc_bh = NULL;
struct ocfs2_journal_handle *handle;
ocfs2_super *osb = OCFS2_SB(inode->i_sb);
- ocfs2_dinode *di = (ocfs2_dinode *) di_bh->b_data;
+ struct ocfs2_dinode *di = (struct ocfs2_dinode *) di_bh->b_data;
inode_alloc_inode =
ocfs2_get_system_file_inode(osb, INODE_ALLOC_SYSTEM_INODE,
@@ -664,7 +664,7 @@
{
int status = 0;
struct ocfs2_inode_info *oi = OCFS2_I(inode);
- ocfs2_dinode *di;
+ struct ocfs2_dinode *di;
*wipe = 0;
@@ -686,7 +686,7 @@
}
/* Do some basic inode verification... */
- di = (ocfs2_dinode *) di_bh->b_data;
+ di = (struct ocfs2_dinode *) di_bh->b_data;
if (!(di->i_flags & cpu_to_le32(OCFS2_ORPHANED_FL))) {
/* for lack of a better error? */
status = -EEXIST;
@@ -1070,7 +1070,7 @@
struct buffer_head *bh)
{
int status;
- ocfs2_dinode *fe = (ocfs2_dinode *) bh->b_data;
+ struct ocfs2_dinode *fe = (struct ocfs2_dinode *) bh->b_data;
mlog_entry("(inode %"MLFu64")\n", OCFS2_I(inode)->ip_blkno);
@@ -1114,7 +1114,7 @@
* does no i/o, only takes ip_lock.
*/
void ocfs2_refresh_inode(struct inode *inode,
- ocfs2_dinode *fe)
+ struct ocfs2_dinode *fe)
{
ocfs2_super *osb = OCFS2_SB(inode->i_sb);
Modified: branches/enotypedefs/fs/ocfs2/inode.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/inode.h 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/inode.h 2005-11-08 21:42:56 UTC (rev 2682)
@@ -127,7 +127,7 @@
int delete_vote);
int ocfs2_inode_init_private(struct inode *inode);
int ocfs2_inode_revalidate(struct dentry *dentry);
-int ocfs2_populate_inode(struct inode *inode, ocfs2_dinode *fe,
+int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
int create_ino);
void ocfs2_read_inode(struct inode *inode);
void ocfs2_read_inode2(struct inode *inode, void *opaque);
@@ -135,7 +135,7 @@
size_t size, loff_t *offp);
void ocfs2_sync_blockdev(struct super_block *sb);
void ocfs2_refresh_inode(struct inode *inode,
- ocfs2_dinode *fe);
+ struct ocfs2_dinode *fe);
int ocfs2_mark_inode_dirty(struct ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *bh);
Modified: branches/enotypedefs/fs/ocfs2/journal.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/journal.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/journal.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -531,7 +531,7 @@
int status = -1;
struct inode *inode = NULL; /* the journal inode */
journal_t *j_journal = NULL;
- ocfs2_dinode *di = NULL;
+ struct ocfs2_dinode *di = NULL;
struct buffer_head *bh = NULL;
ocfs2_super *osb;
int meta_lock = 0;
@@ -569,7 +569,7 @@
}
meta_lock = 1;
- di = (ocfs2_dinode *)bh->b_data;
+ di = (struct ocfs2_dinode *)bh->b_data;
if (inode->i_size < OCFS2_MIN_JOURNAL_SIZE) {
mlog(ML_ERROR, "Journal file size (%lld) is too small!\n",
@@ -628,11 +628,11 @@
unsigned int flags;
struct ocfs2_journal *journal = osb->journal;
struct buffer_head *bh = journal->j_bh;
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
mlog_entry_void();
- fe = (ocfs2_dinode *)bh->b_data;
+ fe = (struct ocfs2_dinode *)bh->b_data;
if (!OCFS2_IS_VALID_DINODE(fe)) {
/* This is called from startup/shutdown which will
* handle the errors in a specific manner, so no need
@@ -893,8 +893,8 @@
struct ocfs2_la_recovery_item {
struct list_head lri_list;
int lri_slot;
- ocfs2_dinode *lri_la_dinode;
- ocfs2_dinode *lri_tl_dinode;
+ struct ocfs2_dinode *lri_la_dinode;
+ struct ocfs2_dinode *lri_tl_dinode;
};
/* Does the second half of the recovery process. By this point, the
@@ -912,7 +912,7 @@
int ret;
ocfs2_super *osb = data;
struct ocfs2_journal *journal = osb->journal;
- ocfs2_dinode *la_dinode, *tl_dinode;
+ struct ocfs2_dinode *la_dinode, *tl_dinode;
struct ocfs2_la_recovery_item *item;
struct list_head *p, *n;
LIST_HEAD(tmp_la_list);
@@ -973,8 +973,8 @@
* ocfs2_complete_recovery */
static void ocfs2_queue_recovery_completion(struct ocfs2_journal *journal,
int slot_num,
- ocfs2_dinode *la_dinode,
- ocfs2_dinode *tl_dinode)
+ struct ocfs2_dinode *la_dinode,
+ struct ocfs2_dinode *tl_dinode)
{
struct ocfs2_la_recovery_item *item;
@@ -1136,7 +1136,7 @@
int got_lock = 0;
unsigned int flags;
struct inode *inode = NULL;
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
journal_t *journal = NULL;
struct buffer_head *bh = NULL;
@@ -1166,7 +1166,7 @@
}
got_lock = 1;
- fe = (ocfs2_dinode *) bh->b_data;
+ fe = (struct ocfs2_dinode *) bh->b_data;
flags = le32_to_cpu(fe->id1.journal1.ij_flags);
@@ -1261,8 +1261,8 @@
int status = 0;
int slot_num;
struct ocfs2_slot_info *si = osb->slot_info;
- ocfs2_dinode *la_copy = NULL;
- ocfs2_dinode *tl_copy = NULL;
+ struct ocfs2_dinode *la_copy = NULL;
+ struct ocfs2_dinode *tl_copy = NULL;
mlog_entry("(node_num=%d, osb->node_num = %d)\n",
node_num, osb->node_num);
@@ -1612,7 +1612,7 @@
int ret = 0;
unsigned int slot;
struct buffer_head *di_bh;
- ocfs2_dinode *di;
+ struct ocfs2_dinode *di;
struct inode *journal = NULL;
for(slot = 0; slot < osb->max_slots; slot++) {
@@ -1633,7 +1633,7 @@
goto out;
}
- di = (ocfs2_dinode *) di_bh->b_data;
+ di = (struct ocfs2_dinode *) di_bh->b_data;
if (le32_to_cpu(di->id1.journal1.ij_flags) &
OCFS2_JOURNAL_DIRTY_FL)
Modified: branches/enotypedefs/fs/ocfs2/journal.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/journal.h 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/journal.h 2005-11-08 21:42:56 UTC (rev 2682)
@@ -38,7 +38,7 @@
};
struct _ocfs2_super;
-struct _ocfs2_dinode;
+struct ocfs2_dinode;
struct ocfs2_journal_handle;
struct ocfs2_journal {
@@ -380,7 +380,7 @@
+ OCFS2_UNLINK_CREDITS)
static inline int ocfs2_calc_extend_credits(struct super_block *sb,
- ocfs2_dinode *fe,
+ struct ocfs2_dinode *fe,
u32 bits_wanted)
{
int bitmap_blocks, sysfile_bitmap_blocks, dinode_blocks;
@@ -430,8 +430,8 @@
static inline int ocfs2_calc_tree_trunc_credits(struct super_block *sb,
unsigned int clusters_to_del,
- ocfs2_dinode *fe,
- ocfs2_extent_list *last_el)
+ struct ocfs2_dinode *fe,
+ struct ocfs2_extent_list *last_el)
{
/* for dinode + all headers in this pass + update to next leaf */
u16 next_free = le16_to_cpu(last_el->l_next_free_rec);
Modified: branches/enotypedefs/fs/ocfs2/localalloc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/localalloc.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/localalloc.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -49,17 +49,17 @@
static inline int ocfs2_local_alloc_window_bits(ocfs2_super *osb);
-static u32 ocfs2_local_alloc_count_bits(ocfs2_dinode *alloc);
+static u32 ocfs2_local_alloc_count_bits(struct ocfs2_dinode *alloc);
static int ocfs2_local_alloc_find_clear_bits(ocfs2_super *osb,
- ocfs2_dinode *alloc,
+ struct ocfs2_dinode *alloc,
u32 numbits);
-static void ocfs2_clear_local_alloc(ocfs2_dinode *alloc);
+static void ocfs2_clear_local_alloc(struct ocfs2_dinode *alloc);
static int ocfs2_sync_local_to_main(ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
- ocfs2_dinode *alloc,
+ struct ocfs2_dinode *alloc,
struct inode *main_bm_inode,
struct buffer_head *main_bm_bh);
@@ -114,11 +114,11 @@
int ocfs2_load_local_alloc(ocfs2_super *osb)
{
int status = 0;
- ocfs2_dinode *alloc = NULL;
+ struct ocfs2_dinode *alloc = NULL;
struct buffer_head *alloc_bh = NULL;
u32 num_used;
struct inode *inode = NULL;
- ocfs2_local_alloc *la;
+ struct ocfs2_local_alloc *la;
mlog_entry_void();
@@ -138,7 +138,7 @@
goto bail;
}
- alloc = (ocfs2_dinode *) alloc_bh->b_data;
+ alloc = (struct ocfs2_dinode *) alloc_bh->b_data;
la = OCFS2_LOCAL_ALLOC(alloc);
if (!(le32_to_cpu(alloc->i_flags) &
@@ -201,8 +201,8 @@
struct buffer_head *bh = NULL;
struct buffer_head *main_bm_bh = NULL;
struct inode *main_bm_inode = NULL;
- ocfs2_dinode *alloc_copy = NULL;
- ocfs2_dinode *alloc = NULL;
+ struct ocfs2_dinode *alloc_copy = NULL;
+ struct ocfs2_dinode *alloc = NULL;
mlog_entry_void();
@@ -253,7 +253,7 @@
}
bh = osb->local_alloc_bh;
- alloc = (ocfs2_dinode *) bh->b_data;
+ alloc = (struct ocfs2_dinode *) bh->b_data;
alloc_copy = kmalloc(bh->b_size, GFP_KERNEL);
if (!alloc_copy) {
@@ -314,12 +314,12 @@
*/
int ocfs2_begin_local_alloc_recovery(ocfs2_super *osb,
int slot_num,
- ocfs2_dinode **alloc_copy)
+ struct ocfs2_dinode **alloc_copy)
{
int status = 0;
struct buffer_head *alloc_bh = NULL;
struct inode *inode = NULL;
- ocfs2_dinode *alloc;
+ struct ocfs2_dinode *alloc;
mlog_entry("(slot_num = %d)\n", slot_num);
@@ -350,7 +350,7 @@
}
memcpy((*alloc_copy), alloc_bh->b_data, alloc_bh->b_size);
- alloc = (ocfs2_dinode *) alloc_bh->b_data;
+ alloc = (struct ocfs2_dinode *) alloc_bh->b_data;
ocfs2_clear_local_alloc(alloc);
status = ocfs2_write_block(osb, alloc_bh, inode);
@@ -382,7 +382,7 @@
* main bitmap.
*/
int ocfs2_complete_local_alloc_recovery(ocfs2_super *osb,
- ocfs2_dinode *alloc)
+ struct ocfs2_dinode *alloc)
{
int status;
struct ocfs2_journal_handle *handle = NULL;
@@ -457,7 +457,7 @@
ocfs2_alloc_context *ac)
{
int status;
- ocfs2_dinode *alloc;
+ struct ocfs2_dinode *alloc;
struct inode *local_alloc_inode;
unsigned int free_bits;
@@ -489,7 +489,7 @@
goto bail;
}
- alloc = (ocfs2_dinode *) osb->local_alloc_bh->b_data;
+ alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data;
if (le32_to_cpu(alloc->id1.bitmap1.i_used) !=
ocfs2_local_alloc_count_bits(alloc)) {
@@ -539,15 +539,15 @@
struct inode *local_alloc_inode;
u32 bits_wanted;
void *bitmap;
- ocfs2_dinode *alloc;
- ocfs2_local_alloc *la;
+ struct ocfs2_dinode *alloc;
+ struct ocfs2_local_alloc *la;
mlog_entry_void();
BUG_ON(ac->ac_which != OCFS2_AC_USE_LOCAL);
bits_wanted = ac->ac_bits_wanted - ac->ac_bits_given;
local_alloc_inode = ac->ac_inode;
- alloc = (ocfs2_dinode *) osb->local_alloc_bh->b_data;
+ alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data;
la = OCFS2_LOCAL_ALLOC(alloc);
start = ocfs2_local_alloc_find_clear_bits(osb, alloc, bits_wanted);
@@ -590,12 +590,12 @@
return status;
}
-static u32 ocfs2_local_alloc_count_bits(ocfs2_dinode *alloc)
+static u32 ocfs2_local_alloc_count_bits(struct ocfs2_dinode *alloc)
{
int i;
u8 *buffer;
u32 count = 0;
- ocfs2_local_alloc *la = OCFS2_LOCAL_ALLOC(alloc);
+ struct ocfs2_local_alloc *la = OCFS2_LOCAL_ALLOC(alloc);
mlog_entry_void();
@@ -608,7 +608,7 @@
}
static int ocfs2_local_alloc_find_clear_bits(ocfs2_super *osb,
- ocfs2_dinode *alloc,
+ struct ocfs2_dinode *alloc,
u32 numbits)
{
int numfound, bitoff, left, startoff, lastzero;
@@ -666,9 +666,9 @@
return bitoff;
}
-static void ocfs2_clear_local_alloc(ocfs2_dinode *alloc)
+static void ocfs2_clear_local_alloc(struct ocfs2_dinode *alloc)
{
- ocfs2_local_alloc *la = OCFS2_LOCAL_ALLOC(alloc);
+ struct ocfs2_local_alloc *la = OCFS2_LOCAL_ALLOC(alloc);
int i;
mlog_entry_void();
@@ -708,7 +708,7 @@
*/
static int ocfs2_sync_local_to_main(ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
- ocfs2_dinode *alloc,
+ struct ocfs2_dinode *alloc,
struct inode *main_bm_inode,
struct buffer_head *main_bm_bh)
{
@@ -717,7 +717,7 @@
u64 la_start_blk;
u64 blkno;
void *bitmap;
- ocfs2_local_alloc *la = OCFS2_LOCAL_ALLOC(alloc);
+ struct ocfs2_local_alloc *la = OCFS2_LOCAL_ALLOC(alloc);
mlog_entry("total = %u, COUNT = %u, used = %u\n",
le32_to_cpu(alloc->id1.bitmap1.i_total),
@@ -825,12 +825,12 @@
{
int status = 0;
u32 cluster_off, cluster_count;
- ocfs2_dinode *alloc = NULL;
- ocfs2_local_alloc *la;
+ struct ocfs2_dinode *alloc = NULL;
+ struct ocfs2_local_alloc *la;
mlog_entry_void();
- alloc = (ocfs2_dinode *) osb->local_alloc_bh->b_data;
+ alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data;
la = OCFS2_LOCAL_ALLOC(alloc);
if (alloc->id1.bitmap1.i_total)
@@ -880,8 +880,8 @@
struct buffer_head *main_bm_bh = NULL;
struct inode *main_bm_inode = NULL;
struct ocfs2_journal_handle *handle = NULL;
- ocfs2_dinode *alloc;
- ocfs2_dinode *alloc_copy = NULL;
+ struct ocfs2_dinode *alloc;
+ struct ocfs2_dinode *alloc_copy = NULL;
ocfs2_alloc_context *ac = NULL;
mlog_entry_void();
@@ -913,7 +913,7 @@
goto bail;
}
- alloc = (ocfs2_dinode *) osb->local_alloc_bh->b_data;
+ alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data;
/* We want to clear the local alloc before doing anything
* else, so that if we error later during this operation,
Modified: branches/enotypedefs/fs/ocfs2/localalloc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/localalloc.h 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/localalloc.h 2005-11-08 21:42:56 UTC (rev 2682)
@@ -32,10 +32,10 @@
int ocfs2_begin_local_alloc_recovery(ocfs2_super *osb,
int node_num,
- ocfs2_dinode **alloc_copy);
+ struct ocfs2_dinode **alloc_copy);
int ocfs2_complete_local_alloc_recovery(ocfs2_super *osb,
- ocfs2_dinode *alloc);
+ struct ocfs2_dinode *alloc);
int ocfs2_alloc_should_use_local(ocfs2_super *osb,
u64 bits);
Modified: branches/enotypedefs/fs/ocfs2/namei.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/namei.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/namei.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -118,7 +118,7 @@
static int ocfs2_orphan_add(ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
- ocfs2_dinode *fe,
+ struct ocfs2_dinode *fe,
char *name,
struct buffer_head *de_bh);
@@ -294,7 +294,7 @@
struct buffer_head *parent_fe_bh = NULL;
struct ocfs2_journal_handle *handle = NULL;
ocfs2_super *osb;
- ocfs2_dinode *dirfe;
+ struct ocfs2_dinode *dirfe;
struct buffer_head *new_fe_bh = NULL;
struct buffer_head *de_bh = NULL;
struct inode *inode = NULL;
@@ -329,7 +329,7 @@
goto leave;
}
- dirfe = (ocfs2_dinode *) parent_fe_bh->b_data;
+ dirfe = (struct ocfs2_dinode *) parent_fe_bh->b_data;
if (!dirfe->i_links_count) {
/* can't make a file in a deleted directory. */
status = -ENOENT;
@@ -461,8 +461,8 @@
ocfs2_alloc_context *inode_ac)
{
int status = 0;
- ocfs2_dinode *fe = NULL;
- ocfs2_extent_list *fel;
+ struct ocfs2_dinode *fe = NULL;
+ struct ocfs2_extent_list *fel;
u64 fe_blkno = 0;
u16 suballoc_bit;
struct inode *inode = NULL;
@@ -517,7 +517,7 @@
goto leave;
}
- fe = (ocfs2_dinode *) (*new_fe_bh)->b_data;
+ fe = (struct ocfs2_dinode *) (*new_fe_bh)->b_data;
memset(fe, 0, osb->sb->s_blocksize);
fe->i_generation = cpu_to_le32(inode->i_generation);
@@ -628,7 +628,7 @@
struct buffer_head *fe_bh = NULL;
struct buffer_head *parent_fe_bh = NULL;
struct buffer_head *de_bh = NULL;
- ocfs2_dinode *fe = NULL;
+ struct ocfs2_dinode *fe = NULL;
ocfs2_super *osb = OCFS2_SB(dir->i_sb);
mlog_entry("(inode=%lu, old='%.*s' new='%.*s')\n", inode->i_ino,
@@ -678,7 +678,7 @@
goto bail;
}
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
if (le16_to_cpu(fe->i_links_count) >= OCFS2_LINK_MAX) {
err = -EMLINK;
goto bail;
@@ -749,7 +749,7 @@
struct inode *inode = dentry->d_inode;
ocfs2_super *osb = OCFS2_SB(dir->i_sb);
u64 blkno;
- ocfs2_dinode *fe = NULL;
+ struct ocfs2_dinode *fe = NULL;
struct buffer_head *fe_bh = NULL;
struct buffer_head *parent_node_bh = NULL;
struct ocfs2_journal_handle *handle = NULL;
@@ -864,7 +864,7 @@
goto leave;
}
- fe = (ocfs2_dinode *) fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) fe_bh->b_data;
if (!inode->i_nlink) {
status = ocfs2_orphan_add(osb, handle, inode, fe, orphan_name,
@@ -1000,7 +1000,7 @@
int status = 0, rename_lock = 0;
struct inode *old_inode = old_dentry->d_inode;
struct inode *new_inode = new_dentry->d_inode;
- ocfs2_dinode *newfe = NULL;
+ struct ocfs2_dinode *newfe = NULL;
char orphan_name[OCFS2_ORPHAN_NAMELEN + 1];
struct buffer_head *orphan_entry_bh = NULL;
struct buffer_head *newfe_bh = NULL;
@@ -1211,7 +1211,7 @@
goto bail;
}
- newfe = (ocfs2_dinode *) newfe_bh->b_data;
+ newfe = (struct ocfs2_dinode *) newfe_bh->b_data;
mlog(0, "aha rename over existing... new_de=%p "
"new_blkno=%"MLFu64" newfebh=%p bhblocknr=%llu\n",
@@ -1356,12 +1356,12 @@
"NULL\n", OCFS2_I(new_dir)->ip_blkno,
(int)new_dir_nlink, new_dir->i_nlink);
} else {
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
status = ocfs2_journal_access(handle,
new_dir,
new_dir_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
- fe = (ocfs2_dinode *) new_dir_bh->b_data;
+ fe = (struct ocfs2_dinode *) new_dir_bh->b_data;
fe->i_links_count = cpu_to_le16(new_dir->i_nlink);
status = ocfs2_journal_dirty(handle, new_dir_bh);
}
@@ -1375,11 +1375,11 @@
(int)old_dir_nlink,
old_dir->i_nlink);
} else {
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
status = ocfs2_journal_access(handle, old_dir,
old_dir_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
- fe = (ocfs2_dinode *) old_dir_bh->b_data;
+ fe = (struct ocfs2_dinode *) old_dir_bh->b_data;
fe->i_links_count = cpu_to_le16(old_dir->i_nlink);
status = ocfs2_journal_dirty(handle, old_dir_bh);
}
@@ -1537,8 +1537,8 @@
struct buffer_head *new_fe_bh = NULL;
struct buffer_head *de_bh = NULL;
struct buffer_head *parent_fe_bh = NULL;
- ocfs2_dinode *fe = NULL;
- ocfs2_dinode *dirfe;
+ struct ocfs2_dinode *fe = NULL;
+ struct ocfs2_dinode *dirfe;
struct ocfs2_journal_handle *handle = NULL;
ocfs2_alloc_context *inode_ac = NULL;
ocfs2_alloc_context *data_ac = NULL;
@@ -1568,7 +1568,7 @@
goto bail;
}
- dirfe = (ocfs2_dinode *) parent_fe_bh->b_data;
+ dirfe = (struct ocfs2_dinode *) parent_fe_bh->b_data;
if (!dirfe->i_links_count) {
/* can't make a file in a deleted directory. */
status = -ENOENT;
@@ -1622,7 +1622,7 @@
goto bail;
}
- fe = (ocfs2_dinode *) new_fe_bh->b_data;
+ fe = (struct ocfs2_dinode *) new_fe_bh->b_data;
inode->i_rdev = 0;
newsize = l - 1;
if (l > ocfs2_fast_symlink_chars(sb)) {
@@ -2098,14 +2098,14 @@
static int ocfs2_orphan_add(ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct inode *inode,
- ocfs2_dinode *fe,
+ struct ocfs2_dinode *fe,
char *name,
struct buffer_head *de_bh)
{
struct inode *orphan_dir_inode = NULL;
struct buffer_head *orphan_dir_bh = NULL;
int status = 0;
- ocfs2_dinode *orphan_fe;
+ struct ocfs2_dinode *orphan_fe;
mlog_entry("(inode->i_ino = %lu)\n", inode->i_ino);
@@ -2136,7 +2136,7 @@
/* we're a cluster, and nlink can change on disk from
* underneath us... */
- orphan_fe = (ocfs2_dinode *) orphan_dir_bh->b_data;
+ orphan_fe = (struct ocfs2_dinode *) orphan_dir_bh->b_data;
if (S_ISDIR(inode->i_mode))
le16_add_cpu(&orphan_fe->i_links_count, 1);
orphan_dir_inode->i_nlink = le16_to_cpu(orphan_fe->i_links_count);
@@ -2187,7 +2187,7 @@
struct buffer_head *orphan_dir_bh)
{
char name[OCFS2_ORPHAN_NAMELEN + 1];
- ocfs2_dinode *orphan_fe;
+ struct ocfs2_dinode *orphan_fe;
int status = 0;
struct buffer_head *target_de_bh = NULL;
struct ocfs2_dir_entry *target_de = NULL;
@@ -2228,7 +2228,7 @@
}
/* do the i_nlink dance! :) */
- orphan_fe = (ocfs2_dinode *) orphan_dir_bh->b_data;
+ orphan_fe = (struct ocfs2_dinode *) orphan_dir_bh->b_data;
if (S_ISDIR(inode->i_mode))
le16_add_cpu(&orphan_fe->i_links_count, -1);
orphan_dir_inode->i_nlink = le16_to_cpu(orphan_fe->i_links_count);
Modified: branches/enotypedefs/fs/ocfs2/ocfs2.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/ocfs2.h 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/ocfs2.h 2005-11-08 21:42:56 UTC (rev 2682)
@@ -237,7 +237,7 @@
/* Next two fields are for local node slot recovery during
* mount. */
int dirty;
- ocfs2_dinode *local_alloc_copy;
+ struct ocfs2_dinode *local_alloc_copy;
struct ocfs2_alloc_stats alloc_stats;
char dev_str[20]; /* "major,minor" of the device */
Modified: branches/enotypedefs/fs/ocfs2/ocfs2_fs.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/ocfs2_fs.h 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/ocfs2_fs.h 2005-11-08 21:42:56 UTC (rev 2682)
@@ -238,23 +238,23 @@
* On disk extent record for OCFS2
* It describes a range of clusters on disk.
*/
-typedef struct _ocfs2_extent_rec {
+struct ocfs2_extent_rec {
/*00*/ __le32 e_cpos; /* Offset into the file, in clusters */
__le32 e_clusters; /* Clusters covered by this extent */
__le64 e_blkno; /* Physical disk offset, in blocks */
/*10*/
-} ocfs2_extent_rec;
+};
-typedef struct _ocfs2_chain_rec {
+struct ocfs2_chain_rec {
__le32 c_free; /* Number of free bits in this chain. */
__le32 c_total; /* Number of total bits in this chain */
__le64 c_blkno; /* Physical disk offset (blocks) of 1st group */
-} ocfs2_chain_rec;
+};
-typedef struct _ocfs2_truncate_rec {
+struct ocfs2_truncate_rec {
__le32 t_start; /* 1st cluster in this log */
__le32 t_clusters; /* Number of total clusters covered */
-} ocfs2_truncate_rec;
+};
/*
* On disk extent list for OCFS2 (node in the tree). Note that this
@@ -262,7 +262,7 @@
* offsets are relative to ocfs2_dinode.id2.i_list or
* ocfs2_extent_block.h_list, respectively.
*/
-typedef struct _ocfs2_extent_list {
+struct ocfs2_extent_list {
/*00*/ __le16 l_tree_depth; /* Extent tree depth from this
point. 0 means data extents
hang directly off this
@@ -272,39 +272,39 @@
__le16 l_reserved1;
__le64 l_reserved2; /* Pad to
sizeof(ocfs2_extent_rec) */
-/*10*/ ocfs2_extent_rec l_recs[0]; /* Extent records */
-} ocfs2_extent_list;
+/*10*/ struct ocfs2_extent_rec l_recs[0]; /* Extent records */
+};
/*
* On disk allocation chain list for OCFS2. Note that this is
* contained inside ocfs2_dinode, so the offsets are relative to
* ocfs2_dinode.id2.i_chain.
*/
-typedef struct _ocfs2_chain_list {
+struct ocfs2_chain_list {
/*00*/ __le16 cl_cpg; /* Clusters per Block Group */
__le16 cl_bpc; /* Bits per cluster */
- __le16 cl_count; /* Total chains in this list */
- __le16 cl_next_free_rec; /* Next unused chain slot */
+ __le16 cl_count; /* Total chains in this list */
+ __le16 cl_next_free_rec; /* Next unused chain slot */
__le64 cl_reserved1;
-/*10*/ ocfs2_chain_rec cl_recs[0]; /* Chain records */
-} ocfs2_chain_list;
+/*10*/ struct ocfs2_chain_rec cl_recs[0]; /* Chain records */
+};
/*
* On disk deallocation log for OCFS2. Note that this is
* contained inside ocfs2_dinode, so the offsets are relative to
* ocfs2_dinode.id2.i_dealloc.
*/
-typedef struct _ocfs2_truncate_log {
-/*00*/ __le16 tl_count; /* Total records in this log */
+struct ocfs2_truncate_log {
+/*00*/ __le16 tl_count; /* Total records in this log */
__le16 tl_used; /* Number of records in use */
__le32 tl_reserved1;
-/*08*/ ocfs2_truncate_rec tl_recs[0]; /* Truncate records */
-} ocfs2_truncate_log;
+/*08*/ struct ocfs2_truncate_rec tl_recs[0]; /* Truncate records */
+};
/*
* On disk extent block (indirect block) for OCFS2
*/
-typedef struct _ocfs2_extent_block
+struct ocfs2_extent_block
{
/*00*/ __u8 h_signature[8]; /* Signature for verification */
__le64 h_reserved1;
@@ -318,16 +318,16 @@
__le64 h_next_leaf_blk; /* Offset on disk, in blocks,
of next leaf header pointing
to data */
-/*30*/ ocfs2_extent_list h_list; /* Extent record list */
+/*30*/ struct ocfs2_extent_list h_list; /* Extent record list */
/* Actual on-disk size is one block */
-} ocfs2_extent_block;
+};
/*
* On disk superblock for OCFS2
* Note that it is contained inside an ocfs2_dinode, so all offsets
* are relative to the start of ocfs2_dinode.id2.
*/
-typedef struct _ocfs2_super_block {
+struct ocfs2_super_block {
/*00*/ __le16 s_major_rev_level;
__le16 s_minor_rev_level;
__le16 s_mnt_count;
@@ -355,26 +355,26 @@
/*50*/ __u8 s_label[OCFS2_MAX_VOL_LABEL_LEN]; /* Label for mounting, etc. */
/*90*/ __u8 s_uuid[OCFS2_VOL_UUID_LEN]; /* 128-bit uuid */
/*A0*/
-} ocfs2_super_block;
+};
/*
* Local allocation bitmap for OCFS2 slots
* Note that it exists inside an ocfs2_dinode, so all offsets are
* relative to the start of ocfs2_dinode.id2.
*/
-typedef struct _ocfs2_local_alloc
+struct ocfs2_local_alloc
{
/*00*/ __le32 la_bm_off; /* Starting bit offset in main bitmap */
__le16 la_size; /* Size of included bitmap, in bytes */
__le16 la_reserved1;
__le64 la_reserved2;
/*10*/ __u8 la_bitmap[0];
-} ocfs2_local_alloc;
+};
/*
* On disk inode for OCFS2
*/
-typedef struct _ocfs2_dinode {
+struct ocfs2_dinode {
/*00*/ __u8 i_signature[8]; /* Signature for validation */
__le32 i_generation; /* Generation number */
__le16 i_suballoc_slot; /* Slot suballocator this inode
@@ -420,15 +420,15 @@
} journal1;
} id1; /* Inode type dependant 1 */
/*C0*/ union {
- ocfs2_super_block i_super;
- ocfs2_local_alloc i_lab;
- ocfs2_chain_list i_chain;
- ocfs2_extent_list i_list;
- ocfs2_truncate_log i_dealloc;
- __u8 i_symlink[0];
+ struct ocfs2_super_block i_super;
+ struct ocfs2_local_alloc i_lab;
+ struct ocfs2_chain_list i_chain;
+ struct ocfs2_extent_list i_list;
+ struct ocfs2_truncate_log i_dealloc;
+ __u8 i_symlink[0];
} id2;
/* Actual on-disk size is one block */
-} ocfs2_dinode;
+};
/*
* On-disk directory entry structure for OCFS2
@@ -447,7 +447,7 @@
/*
* On disk allocator group structure for OCFS2
*/
-typedef struct _ocfs2_group_desc
+struct ocfs2_group_desc
{
/*00*/ __u8 bg_signature[8]; /* Signature for validation */
__le16 bg_size; /* Size of included bitmap in
@@ -465,13 +465,13 @@
__le64 bg_blkno; /* Offset on disk, in blocks */
/*30*/ __le64 bg_reserved2[2];
/*40*/ __u8 bg_bitmap[0];
-} ocfs2_group_desc;
+};
#ifdef __KERNEL__
static inline int ocfs2_fast_symlink_chars(struct super_block *sb)
{
return sb->s_blocksize -
- offsetof(struct _ocfs2_dinode, id2.i_symlink);
+ offsetof(struct ocfs2_dinode, id2.i_symlink);
}
static inline int ocfs2_extent_recs_per_inode(struct super_block *sb)
@@ -479,9 +479,9 @@
int size;
size = sb->s_blocksize -
- offsetof(struct _ocfs2_dinode, id2.i_list.l_recs);
+ offsetof(struct ocfs2_dinode, id2.i_list.l_recs);
- return size / sizeof(struct _ocfs2_extent_rec);
+ return size / sizeof(struct ocfs2_extent_rec);
}
static inline int ocfs2_chain_recs_per_inode(struct super_block *sb)
@@ -489,9 +489,9 @@
int size;
size = sb->s_blocksize -
- offsetof(struct _ocfs2_dinode, id2.i_chain.cl_recs);
+ offsetof(struct ocfs2_dinode, id2.i_chain.cl_recs);
- return size / sizeof(struct _ocfs2_chain_rec);
+ return size / sizeof(struct ocfs2_chain_rec);
}
static inline u16 ocfs2_extent_recs_per_eb(struct super_block *sb)
@@ -499,9 +499,9 @@
int size;
size = sb->s_blocksize -
- offsetof(struct _ocfs2_extent_block, h_list.l_recs);
+ offsetof(struct ocfs2_extent_block, h_list.l_recs);
- return size / sizeof(struct _ocfs2_extent_rec);
+ return size / sizeof(struct ocfs2_extent_rec);
}
static inline u16 ocfs2_local_alloc_size(struct super_block *sb)
@@ -509,7 +509,7 @@
u16 size;
size = sb->s_blocksize -
- offsetof(struct _ocfs2_dinode, id2.i_lab.la_bitmap);
+ offsetof(struct ocfs2_dinode, id2.i_lab.la_bitmap);
return size;
}
@@ -519,7 +519,7 @@
int size;
size = sb->s_blocksize -
- offsetof(struct _ocfs2_group_desc, bg_bitmap);
+ offsetof(struct ocfs2_group_desc, bg_bitmap);
return size;
}
@@ -529,14 +529,14 @@
int size;
size = sb->s_blocksize -
- offsetof(struct _ocfs2_dinode, id2.i_dealloc.tl_recs);
+ offsetof(struct ocfs2_dinode, id2.i_dealloc.tl_recs);
- return size / sizeof(struct _ocfs2_truncate_rec);
+ return size / sizeof(struct ocfs2_truncate_rec);
}
#else
static inline int ocfs2_fast_symlink_chars(int blocksize)
{
- return blocksize - offsetof(struct _ocfs2_dinode, id2.i_symlink);
+ return blocksize - offsetof(struct ocfs2_dinode, id2.i_symlink);
}
static inline int ocfs2_extent_recs_per_inode(int blocksize)
@@ -544,9 +544,9 @@
int size;
size = blocksize -
- offsetof(struct _ocfs2_dinode, id2.i_list.l_recs);
+ offsetof(struct ocfs2_dinode, id2.i_list.l_recs);
- return size / sizeof(struct _ocfs2_extent_rec);
+ return size / sizeof(struct ocfs2_extent_rec);
}
static inline int ocfs2_chain_recs_per_inode(int blocksize)
@@ -554,9 +554,9 @@
int size;
size = blocksize -
- offsetof(struct _ocfs2_dinode, id2.i_chain.cl_recs);
+ offsetof(struct ocfs2_dinode, id2.i_chain.cl_recs);
- return size / sizeof(struct _ocfs2_chain_rec);
+ return size / sizeof(struct ocfs2_chain_rec);
}
static inline int ocfs2_extent_recs_per_eb(int blocksize)
@@ -564,9 +564,9 @@
int size;
size = blocksize -
- offsetof(struct _ocfs2_extent_block, h_list.l_recs);
+ offsetof(struct ocfs2_extent_block, h_list.l_recs);
- return size / sizeof(struct _ocfs2_extent_rec);
+ return size / sizeof(struct ocfs2_extent_rec);
}
static inline int ocfs2_local_alloc_size(int blocksize)
@@ -574,7 +574,7 @@
int size;
size = blocksize -
- offsetof(struct _ocfs2_dinode, id2.i_lab.la_bitmap);
+ offsetof(struct ocfs2_dinode, id2.i_lab.la_bitmap);
return size;
}
@@ -584,7 +584,7 @@
int size;
size = blocksize -
- offsetof(struct _ocfs2_group_desc, bg_bitmap);
+ offsetof(struct ocfs2_group_desc, bg_bitmap);
return size;
}
@@ -594,9 +594,9 @@
int size;
size = blocksize -
- offsetof(struct _ocfs2_dinode, id2.i_dealloc.tl_recs);
+ offsetof(struct ocfs2_dinode, id2.i_dealloc.tl_recs);
- return size / sizeof(struct _ocfs2_truncate_rec);
+ return size / sizeof(struct ocfs2_truncate_rec);
}
#endif /* __KERNEL__ */
Modified: branches/enotypedefs/fs/ocfs2/suballoc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/suballoc.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/suballoc.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -46,15 +46,15 @@
#include "buffer_head_io.h"
-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 inline void ocfs2_debug_bg(struct ocfs2_group_desc *bg);
+static inline void ocfs2_debug_suballoc_inode(struct ocfs2_dinode *fe);
+static inline u16 ocfs2_find_victim_chain(struct ocfs2_chain_list *cl);
static int ocfs2_block_group_fill(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *bg_bh,
u64 group_blkno,
u16 my_chain,
- ocfs2_chain_list *cl);
+ struct ocfs2_chain_list *cl);
static int ocfs2_block_group_alloc(ocfs2_super *osb,
struct inode *alloc_inode,
struct buffer_head *bh);
@@ -92,13 +92,13 @@
u16 *bits_found);
static inline int ocfs2_block_group_set_bits(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
- ocfs2_group_desc *bg,
+ struct 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(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
- ocfs2_group_desc *bg,
+ struct ocfs2_group_desc *bg,
struct buffer_head *group_bh,
unsigned int bit_off,
unsigned int num_bits);
@@ -109,7 +109,7 @@
struct buffer_head *bg_bh,
struct buffer_head *prev_bg_bh,
u16 chain);
-static inline int ocfs2_block_group_reasonably_empty(ocfs2_group_desc *bg,
+static inline int ocfs2_block_group_reasonably_empty(struct ocfs2_group_desc *bg,
u32 wanted);
static int ocfs2_free_suballoc_bits(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
@@ -138,7 +138,7 @@
kfree(ac);
}
-static u32 ocfs2_bits_per_group(ocfs2_chain_list *cl)
+static u32 ocfs2_bits_per_group(struct ocfs2_chain_list *cl)
{
return (u32)le16_to_cpu(cl->cl_cpg) * (u32)le16_to_cpu(cl->cl_bpc);
}
@@ -148,10 +148,10 @@
struct buffer_head *bg_bh,
u64 group_blkno,
u16 my_chain,
- ocfs2_chain_list *cl)
+ struct ocfs2_chain_list *cl)
{
int status = 0;
- ocfs2_group_desc *bg = (ocfs2_group_desc *) bg_bh->b_data;
+ struct ocfs2_group_desc *bg = (struct ocfs2_group_desc *) bg_bh->b_data;
struct super_block * sb = alloc_inode->i_sb;
mlog_entry_void();
@@ -200,7 +200,7 @@
return status;
}
-static inline u16 ocfs2_find_smallest_chain(ocfs2_chain_list *cl)
+static inline u16 ocfs2_find_smallest_chain(struct ocfs2_chain_list *cl)
{
u16 curr, best;
@@ -222,15 +222,15 @@
struct buffer_head *bh)
{
int status, credits;
- ocfs2_dinode *fe = (ocfs2_dinode *) bh->b_data;
- ocfs2_chain_list *cl;
+ struct ocfs2_dinode *fe = (struct ocfs2_dinode *) bh->b_data;
+ struct ocfs2_chain_list *cl;
ocfs2_alloc_context *ac = NULL;
struct ocfs2_journal_handle *handle = NULL;
u32 bit_off, num_bits;
u16 alloc_rec;
u64 bg_blkno;
struct buffer_head *bg_bh = NULL;
- ocfs2_group_desc *bg;
+ struct ocfs2_group_desc *bg;
BUG_ON(ocfs2_is_cluster_bitmap(alloc_inode));
@@ -302,7 +302,7 @@
goto bail;
}
- bg = (ocfs2_group_desc *) bg_bh->b_data;
+ bg = (struct ocfs2_group_desc *) bg_bh->b_data;
status = ocfs2_journal_access(handle, alloc_inode,
bh, OCFS2_JOURNAL_ACCESS_WRITE);
@@ -361,7 +361,7 @@
struct inode *alloc_inode = ac->ac_inode;
struct buffer_head *bh = NULL;
struct ocfs2_journal_handle *handle = ac->ac_handle;
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
u32 free_bits;
mlog_entry_void();
@@ -375,7 +375,7 @@
goto bail;
}
- fe = (ocfs2_dinode *) bh->b_data;
+ fe = (struct ocfs2_dinode *) bh->b_data;
if (!OCFS2_IS_VALID_DINODE(fe)) {
OCFS2_RO_ON_INVALID_DINODE(alloc_inode->i_sb, fe);
status = -EIO;
@@ -426,7 +426,7 @@
int ocfs2_reserve_new_metadata(ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
- ocfs2_dinode *fe,
+ struct ocfs2_dinode *fe,
ocfs2_alloc_context **ac)
{
int status;
@@ -648,14 +648,14 @@
static int ocfs2_test_bg_bit_allocatable(struct buffer_head *bg_bh,
int nr)
{
- ocfs2_group_desc *bg = (ocfs2_group_desc *) bg_bh->b_data;
+ struct ocfs2_group_desc *bg = (struct ocfs2_group_desc *) bg_bh->b_data;
if (ocfs2_test_bit(nr, (unsigned long *)bg->bg_bitmap))
return 0;
if (!buffer_jbd(bg_bh) || !bh2jh(bg_bh)->b_committed_data)
return 1;
- bg = (ocfs2_group_desc *) bh2jh(bg_bh)->b_committed_data;
+ bg = (struct ocfs2_group_desc *) bh2jh(bg_bh)->b_committed_data;
return !ocfs2_test_bit(nr, (unsigned long *)bg->bg_bitmap);
}
@@ -668,7 +668,7 @@
void *bitmap;
u16 best_offset, best_size;
int offset, start, found, status = 0;
- ocfs2_group_desc *bg = (ocfs2_group_desc *) bg_bh->b_data;
+ struct ocfs2_group_desc *bg = (struct ocfs2_group_desc *) bg_bh->b_data;
if (!OCFS2_IS_VALID_GROUP_DESC(bg)) {
OCFS2_RO_ON_INVALID_GROUP_DESC(osb->sb, bg);
@@ -729,7 +729,7 @@
static inline int ocfs2_block_group_set_bits(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
- ocfs2_group_desc *bg,
+ struct ocfs2_group_desc *bg,
struct buffer_head *group_bh,
unsigned int bit_off,
unsigned int num_bits)
@@ -780,7 +780,7 @@
}
/* find the one with the most empty bits */
-static inline u16 ocfs2_find_victim_chain(ocfs2_chain_list *cl)
+static inline u16 ocfs2_find_victim_chain(struct ocfs2_chain_list *cl)
{
u16 curr, best;
@@ -809,9 +809,9 @@
/* there is a really tiny chance the journal calls could fail,
* but we wouldn't want inconsistent blocks in *any* case. */
u64 fe_ptr, bg_ptr, prev_bg_ptr;
- ocfs2_dinode *fe = (ocfs2_dinode *) fe_bh->b_data;
- ocfs2_group_desc *bg = (ocfs2_group_desc *) bg_bh->b_data;
- ocfs2_group_desc *prev_bg = (ocfs2_group_desc *) prev_bg_bh->b_data;
+ struct ocfs2_dinode *fe = (struct ocfs2_dinode *) fe_bh->b_data;
+ struct ocfs2_group_desc *bg = (struct ocfs2_group_desc *) bg_bh->b_data;
+ struct ocfs2_group_desc *prev_bg = (struct ocfs2_group_desc *) prev_bg_bh->b_data;
if (!OCFS2_IS_VALID_DINODE(fe)) {
OCFS2_RO_ON_INVALID_DINODE(alloc_inode->i_sb, fe);
@@ -894,7 +894,7 @@
return status;
}
-static inline int ocfs2_block_group_reasonably_empty(ocfs2_group_desc *bg,
+static inline int ocfs2_block_group_reasonably_empty(struct ocfs2_group_desc *bg,
u32 wanted)
{
return le16_to_cpu(bg->bg_free_bits_count) > wanted;
@@ -909,7 +909,7 @@
{
int search = -ENOSPC;
int ret;
- ocfs2_group_desc *bg = (ocfs2_group_desc *) group_bh->b_data;
+ struct ocfs2_group_desc *bg = (struct ocfs2_group_desc *) group_bh->b_data;
u16 tmp_off, tmp_found;
BUG_ON(!ocfs2_is_cluster_bitmap(inode));
@@ -941,7 +941,7 @@
u16 *bit_off, u16 *bits_found)
{
int ret = -ENOSPC;
- ocfs2_group_desc *bg = (ocfs2_group_desc *) group_bh->b_data;
+ struct ocfs2_group_desc *bg = (struct ocfs2_group_desc *) group_bh->b_data;
BUG_ON(min_bits != 1);
BUG_ON(ocfs2_is_cluster_bitmap(inode));
@@ -969,9 +969,9 @@
struct inode *alloc_inode = ac->ac_inode;
struct buffer_head *group_bh = NULL;
struct buffer_head *prev_group_bh = NULL;
- ocfs2_dinode *fe = (ocfs2_dinode *) ac->ac_bh->b_data;
- ocfs2_chain_list *cl = (ocfs2_chain_list *) &fe->id2.i_chain;
- ocfs2_group_desc *bg;
+ struct ocfs2_dinode *fe = (struct ocfs2_dinode *) ac->ac_bh->b_data;
+ struct ocfs2_chain_list *cl = (struct ocfs2_chain_list *) &fe->id2.i_chain;
+ struct ocfs2_group_desc *bg;
chain = ac->ac_chain;
mlog(0, "trying to alloc %u bits from chain %u, inode %"MLFu64"\n",
@@ -984,7 +984,7 @@
mlog_errno(status);
goto bail;
}
- bg = (ocfs2_group_desc *) group_bh->b_data;
+ bg = (struct ocfs2_group_desc *) group_bh->b_data;
if (!OCFS2_IS_VALID_GROUP_DESC(bg)) {
OCFS2_RO_ON_INVALID_GROUP_DESC(alloc_inode->i_sb, bg);
status = -EIO;
@@ -1014,7 +1014,7 @@
mlog_errno(status);
goto bail;
}
- bg = (ocfs2_group_desc *) group_bh->b_data;
+ bg = (struct ocfs2_group_desc *) group_bh->b_data;
if (!OCFS2_IS_VALID_GROUP_DESC(bg)) {
OCFS2_RO_ON_INVALID_GROUP_DESC(alloc_inode->i_sb, bg);
status = -EIO;
@@ -1117,8 +1117,8 @@
{
int status;
u16 victim, i;
- ocfs2_chain_list *cl;
- ocfs2_dinode *fe;
+ struct ocfs2_chain_list *cl;
+ struct ocfs2_dinode *fe;
mlog_entry_void();
@@ -1126,7 +1126,7 @@
BUG_ON(bits_wanted > (ac->ac_bits_wanted - ac->ac_bits_given));
BUG_ON(!ac->ac_bh);
- fe = (ocfs2_dinode *) ac->ac_bh->b_data;
+ fe = (struct ocfs2_dinode *) ac->ac_bh->b_data;
if (!OCFS2_IS_VALID_DINODE(fe)) {
OCFS2_RO_ON_INVALID_DINODE(osb->sb, fe);
status = -EIO;
@@ -1143,7 +1143,7 @@
goto bail;
}
- cl = (ocfs2_chain_list *) &fe->id2.i_chain;
+ cl = (struct ocfs2_chain_list *) &fe->id2.i_chain;
victim = ocfs2_find_victim_chain(cl);
ac->ac_chain = victim;
@@ -1402,7 +1402,7 @@
static inline int ocfs2_block_group_clear_bits(struct ocfs2_journal_handle *handle,
struct inode *alloc_inode,
- ocfs2_group_desc *bg,
+ struct ocfs2_group_desc *bg,
struct buffer_head *group_bh,
unsigned int bit_off,
unsigned int num_bits)
@@ -1410,7 +1410,7 @@
int status;
unsigned int tmp;
int journal_type = OCFS2_JOURNAL_ACCESS_WRITE;
- ocfs2_group_desc *undo_bg = NULL;
+ struct ocfs2_group_desc *undo_bg = NULL;
mlog_entry_void();
@@ -1433,7 +1433,7 @@
}
if (ocfs2_is_cluster_bitmap(alloc_inode))
- undo_bg = (ocfs2_group_desc *) bh2jh(group_bh)->b_committed_data;
+ undo_bg = (struct ocfs2_group_desc *) bh2jh(group_bh)->b_committed_data;
tmp = num_bits;
while(tmp--) {
@@ -1465,10 +1465,10 @@
int status = 0;
u32 tmp_used;
ocfs2_super *osb = OCFS2_SB(alloc_inode->i_sb);
- ocfs2_dinode *fe = (ocfs2_dinode *) alloc_bh->b_data;
- ocfs2_chain_list *cl = &fe->id2.i_chain;
+ 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;
- ocfs2_group_desc *group;
+ struct ocfs2_group_desc *group;
mlog_entry_void();
@@ -1491,7 +1491,7 @@
goto bail;
}
- group = (ocfs2_group_desc *) group_bh->b_data;
+ group = (struct ocfs2_group_desc *) group_bh->b_data;
if (!OCFS2_IS_VALID_GROUP_DESC(group)) {
OCFS2_RO_ON_INVALID_GROUP_DESC(alloc_inode->i_sb, group);
status = -EIO;
@@ -1543,7 +1543,7 @@
int ocfs2_free_dinode(struct ocfs2_journal_handle *handle,
struct inode *inode_alloc_inode,
struct buffer_head *inode_alloc_bh,
- ocfs2_dinode *di)
+ struct ocfs2_dinode *di)
{
u64 blk = le64_to_cpu(di->i_blkno);
u16 bit = le16_to_cpu(di->i_suballoc_bit);
@@ -1556,7 +1556,7 @@
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)
+ struct ocfs2_extent_block *eb)
{
u64 blk = le64_to_cpu(eb->h_blkno);
u16 bit = le16_to_cpu(eb->h_suballoc_bit);
@@ -1575,7 +1575,7 @@
int status;
u16 bg_start_bit;
u64 bg_blkno;
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
/* You can't ever have a contiguous set of clusters
* bigger than a block group bitmap so we never have to worry
@@ -1587,7 +1587,7 @@
* gotten tested really well. */
BUG_ON(start_blk != ocfs2_clusters_to_blocks(bitmap_inode->i_sb, ocfs2_blocks_to_clusters(bitmap_inode->i_sb, start_blk)));
- fe = (ocfs2_dinode *) bitmap_bh->b_data;
+ fe = (struct ocfs2_dinode *) bitmap_bh->b_data;
ocfs2_block_to_cluster_group(bitmap_inode, start_blk, &bg_blkno,
&bg_start_bit);
@@ -1607,7 +1607,7 @@
return status;
}
-static inline void ocfs2_debug_bg(ocfs2_group_desc *bg)
+static inline void ocfs2_debug_bg(struct ocfs2_group_desc *bg)
{
printk("Block Group:\n");
printk("bg_signature: %s\n", bg->bg_signature);
@@ -1621,7 +1621,7 @@
printk("bg_blkno: %"MLFu64"\n", bg->bg_blkno);
}
-static inline void ocfs2_debug_suballoc_inode(ocfs2_dinode *fe)
+static inline void ocfs2_debug_suballoc_inode(struct ocfs2_dinode *fe)
{
int i;
Modified: branches/enotypedefs/fs/ocfs2/suballoc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/suballoc.h 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/suballoc.h 2005-11-08 21:42:56 UTC (rev 2682)
@@ -59,7 +59,7 @@
int ocfs2_reserve_new_metadata(ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
- ocfs2_dinode *fe,
+ struct ocfs2_dinode *fe,
ocfs2_alloc_context **ac);
int ocfs2_reserve_new_inode(ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
@@ -91,11 +91,11 @@
int ocfs2_free_dinode(struct ocfs2_journal_handle *handle,
struct inode *inode_alloc_inode,
struct buffer_head *inode_alloc_bh,
- ocfs2_dinode *di);
+ struct ocfs2_dinode *di);
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);
+ struct ocfs2_extent_block *eb);
int ocfs2_free_clusters(struct ocfs2_journal_handle *handle,
struct inode *bitmap_inode,
struct buffer_head *bitmap_bh,
Modified: branches/enotypedefs/fs/ocfs2/super.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/super.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/super.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -106,7 +106,7 @@
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_verify_volume(ocfs2_dinode *di,
+static int ocfs2_verify_volume(struct ocfs2_dinode *di,
struct buffer_head *bh,
u32 sectsize);
static int ocfs2_initialize_super(struct super_block *sb,
@@ -447,7 +447,7 @@
{
int status = 0, tmpstat;
ocfs1_vol_disk_hdr *hdr;
- ocfs2_dinode *di;
+ struct ocfs2_dinode *di;
int blksize;
*bh = NULL;
@@ -508,7 +508,7 @@
mlog_errno(status);
goto bail;
}
- di = (ocfs2_dinode *) (*bh)->b_data;
+ di = (struct ocfs2_dinode *) (*bh)->b_data;
status = ocfs2_verify_volume(di, *bh, blksize);
if (status >= 0)
goto bail;
@@ -867,7 +867,7 @@
ocfs2_super *osb;
u32 numbits, freebits;
int status;
- ocfs2_dinode *bm_lock;
+ struct ocfs2_dinode *bm_lock;
struct buffer_head *bh = NULL;
struct inode *inode = NULL;
@@ -890,7 +890,7 @@
goto bail;
}
- bm_lock = (ocfs2_dinode *) bh->b_data;
+ bm_lock = (struct ocfs2_dinode *) bh->b_data;
numbits = le32_to_cpu(bm_lock->id1.bitmap1.i_total);
freebits = numbits - le32_to_cpu(bm_lock->id1.bitmap1.i_used);
@@ -1238,7 +1238,7 @@
{
int status = 0;
int i;
- ocfs2_dinode *di = NULL;
+ struct ocfs2_dinode *di = NULL;
struct inode *inode = NULL;
struct buffer_head *bitmap_bh = NULL;
struct ocfs2_journal *journal;
@@ -1325,7 +1325,7 @@
goto bail;
}
- di = (ocfs2_dinode *)bh->b_data;
+ di = (struct ocfs2_dinode *)bh->b_data;
osb->max_slots = le16_to_cpu(di->id2.i_super.s_max_slots);
if (osb->max_slots > OCFS2_MAX_SLOTS || osb->max_slots == 0) {
@@ -1460,7 +1460,7 @@
goto bail;
}
- di = (ocfs2_dinode *) bitmap_bh->b_data;
+ di = (struct ocfs2_dinode *) bitmap_bh->b_data;
osb->bitmap_cpg = le16_to_cpu(di->id2.i_chain.cl_cpg);
osb->num_clusters = le32_to_cpu(di->id1.bitmap1.i_total);
brelse(bitmap_bh);
@@ -1495,7 +1495,8 @@
* -EINVAL if there is a bad superblock
* 0 on success
*/
-static int ocfs2_verify_volume(ocfs2_dinode *di, struct buffer_head *bh,
+static int ocfs2_verify_volume(struct ocfs2_dinode *di,
+ struct buffer_head *bh,
u32 blksz)
{
int status = -EAGAIN;
@@ -1552,9 +1553,9 @@
{
int status = 0;
int dirty;
- ocfs2_dinode *local_alloc = NULL; /* only used if we
- * recover
- * ourselves. */
+ struct ocfs2_dinode *local_alloc = NULL; /* only used if we
+ * recover
+ * ourselves. */
mlog_entry_void();
Modified: branches/enotypedefs/fs/ocfs2/symlink.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/symlink.c 2005-11-08 21:28:56 UTC (rev 2681)
+++ branches/enotypedefs/fs/ocfs2/symlink.c 2005-11-08 21:42:56 UTC (rev 2682)
@@ -87,7 +87,7 @@
{
int status;
char *link = NULL;
- ocfs2_dinode *fe;
+ struct ocfs2_dinode *fe;
mlog_entry_void();
@@ -102,7 +102,7 @@
goto bail;
}
- fe = (ocfs2_dinode *) (*bh)->b_data;
+ fe = (struct ocfs2_dinode *) (*bh)->b_data;
link = (char *) fe->id2.i_symlink;
bail:
mlog_exit(status);
More information about the Ocfs2-commits
mailing list