[Ocfs2-commits] jlbec commits r1074 - branches/format-changes/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Sun Jun 13 00:41:18 CDT 2004
Author: jlbec
Date: 2004-06-12 23:41:16 -0500 (Sat, 12 Jun 2004)
New Revision: 1074
Modified:
branches/format-changes/src/alloc.c
branches/format-changes/src/ocfs2_fs.h
Log:
o Start using ocfs2_dinode for the local alloc block.
Modified: branches/format-changes/src/alloc.c
===================================================================
--- branches/format-changes/src/alloc.c 2004-06-13 01:28:23 UTC (rev 1073)
+++ branches/format-changes/src/alloc.c 2004-06-13 04:41:16 UTC (rev 1074)
@@ -131,13 +131,13 @@
ocfs_bitmap_free_head **f,
struct buffer_head *local_alloc_bh,
int in_recovery);
-static __u32 ocfs_alloc_count_bits(ocfs2_local_alloc *alloc);
-static void ocfs_clear_local_alloc(ocfs2_local_alloc *alloc);
+static __u32 ocfs_alloc_count_bits(ocfs2_dinode *alloc);
+static void ocfs_clear_local_alloc(ocfs2_dinode *alloc);
static int ocfs_find_space_from_local(ocfs_super *osb, __u32 bitswanted,
__u64 * bitoff, __u64 * bitcount,
ocfs_journal_handle *handle);
static int ocfs_local_find_clear_bits(ocfs_super *osb,
- ocfs2_local_alloc *alloc,
+ ocfs2_dinode *alloc,
__u32 numbits);
static int ocfs_extent_contig(struct inode *inode, ocfs2_extent_rec *ext,
u64 blkno);
@@ -3421,7 +3421,7 @@
/*
* ocfs_alloc_count_bits
*/
-static __u32 ocfs_alloc_count_bits(ocfs2_local_alloc *alloc)
+static __u32 ocfs_alloc_count_bits(ocfs2_dinode *alloc)
{
int i;
__u8 tmp;
@@ -3444,7 +3444,7 @@
/*
* ocfs_clear_local_alloc
*/
-static void ocfs_clear_local_alloc(ocfs2_local_alloc *alloc)
+static void ocfs_clear_local_alloc(ocfs2_dinode *alloc)
{
int i;
LOG_ENTRY();
@@ -3478,7 +3478,7 @@
{
int status = 0;
int bit_off, left;
- ocfs2_local_alloc *alloc = NULL;
+ ocfs2_dinode *alloc = NULL;
void *bitmap;
LOG_ENTRY();
@@ -3551,7 +3551,7 @@
{
int status = 0;
__u64 alloc_bytes, cluster_off, cluster_count;
- ocfs2_local_alloc *alloc = NULL;
+ ocfs2_dinode *alloc = NULL;
LOG_ENTRY();
@@ -3607,7 +3607,7 @@
* ocfs_local_find_clear_bits
*/
static int ocfs_local_find_clear_bits(ocfs_super *osb,
- ocfs2_local_alloc *alloc,
+ ocfs2_dinode *alloc,
__u32 numbits)
{
int numfound, bitoff, left, startoff, lastzero;
@@ -3672,7 +3672,7 @@
__u64 * bitoff, __u64 * bitcount,
ocfs_journal_handle *handle)
{
- ocfs2_local_alloc *alloc = NULL;
+ ocfs2_dinode *alloc = NULL;
int status = 0, tmpstat;
int startoff, tmpoff;
__u32 tmpwanted;
@@ -3924,7 +3924,7 @@
int ocfs_load_local_alloc(ocfs_super *osb)
{
int status = 0;
- ocfs2_local_alloc *alloc = NULL;
+ ocfs2_dinode *alloc = NULL;
struct buffer_head *alloc_bh = NULL;
__u32 num_used;
struct inode *inode = NULL;
@@ -3988,7 +3988,7 @@
int in_recovery)
{
int status;
- ocfs2_local_alloc *alloc = NULL;
+ ocfs2_dinode *alloc = NULL;
ocfs_bitmap_free_head *f = NULL;
struct buffer_head *bh = NULL;
Modified: branches/format-changes/src/ocfs2_fs.h
===================================================================
--- branches/format-changes/src/ocfs2_fs.h 2004-06-13 01:28:23 UTC (rev 1073)
+++ branches/format-changes/src/ocfs2_fs.h 2004-06-13 04:41:16 UTC (rev 1074)
@@ -135,13 +135,9 @@
/*
* Convenience casts
*/
-#define OCFS2_RAW_SB(inode) (inode->id2.i_super)
-#define DISK_LOCK(x) ((ocfs2_disk_lock *)&(x)->i_disk_lock)
-#if 0 /* When LOCAL_ALLOC() is on an inode */
-#define LOCAL_ALLOC(i) ((i)->id2.i_lab)
-#else
-#define LOCAL_ALLOC(l) (l)
-#endif
+#define OCFS2_RAW_SB(dinode) (&((dinode)->id2.i_super))
+#define DISK_LOCK(dinode) (&((dinode)->i_disk_lock))
+#define LOCAL_ALLOC(dinode) (&((dinode)->id2.i_lab))
typedef struct _ocfs2_local_alloc
More information about the Ocfs2-commits
mailing list