[Ocfs2-commits] jlbec commits r908 - in trunk/src: . inc
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon May 10 11:49:56 CDT 2004
Author: jlbec
Date: 2004-05-10 10:49:54 -0500 (Mon, 10 May 2004)
New Revision: 908
Modified:
trunk/src/alloc.c
trunk/src/dir.c
trunk/src/dlm.c
trunk/src/extmap.c
trunk/src/hash.c
trunk/src/inc/proto.h
trunk/src/inode.c
trunk/src/journal.c
trunk/src/volcfg.c
trunk/src/vote.c
Log:
Remove some static functions from proto.h
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-05-08 00:22:23 UTC (rev 907)
+++ trunk/src/alloc.c 2004-05-10 15:49:54 UTC (rev 908)
@@ -117,9 +117,10 @@
return(status);
}
-int ocfs_add_to_bitmap_free_head(ocfs_super *osb, ocfs_bitmap_free_head *f,
- __u32 len, __u32 fileoff, __u32 nodenum,
- __u32 type)
+int ocfs_add_to_bitmap_free_head(ocfs_super *osb,
+ ocfs_bitmap_free_head *f,
+ __u32 len, __u32 fileoff,
+ __u32 nodenum, __u32 type)
{
int status = 0, n;
ocfs_free_rec *log;
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-05-08 00:22:23 UTC (rev 907)
+++ trunk/src/dir.c 2004-05-10 15:49:54 UTC (rev 908)
@@ -296,7 +296,7 @@
* ocfs_write_dir_node()
*
*/
-int ocfs_write_dir_node (ocfs_super * osb, struct buffer_head *bhs[], __s32 idx, struct inode *dir_inode, struct inode *file_inode)
+static int ocfs_write_dir_node (ocfs_super * osb, struct buffer_head *bhs[], __s32 idx, struct inode *dir_inode, struct inode *file_inode)
{
int status = 0;
__u64 offset;
Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c 2004-05-08 00:22:23 UTC (rev 907)
+++ trunk/src/dlm.c 2004-05-10 15:49:54 UTC (rev 908)
@@ -186,7 +186,7 @@
*
* Returns 0 of success, < 0 if error.
*/
-int ocfs_wait_for_disk_lock_release (ocfs_super * osb, __u64 offset, __u32 time_to_wait, __u32 lock_type)
+static int ocfs_wait_for_disk_lock_release (ocfs_super * osb, __u64 offset, __u32 time_to_wait, __u32 lock_type)
{
int status = -ETIMEDOUT;
int tmpstat = -ETIMEDOUT;
Modified: trunk/src/extmap.c
===================================================================
--- trunk/src/extmap.c 2004-05-08 00:22:23 UTC (rev 907)
+++ trunk/src/extmap.c 2004-05-10 15:49:54 UTC (rev 908)
@@ -436,6 +436,31 @@
/*
+ * ocfs_remove_extent_map_entry()
+ *
+ * Remove an entry from the extent map
+ */
+static void ocfs_remove_extent_map_entry (ocfs_super * osb, ocfs_extent_map * Map, __s64 Vbo, __u32 ByteCount)
+{
+ LOG_ENTRY ();
+
+ if ((ByteCount) && (ByteCount != 0xFFFFFFFF)) {
+ ByteCount--;
+ ByteCount >>= OCFS_LOG_SECTOR_SIZE;
+ ByteCount++;
+ }
+
+ Vbo >>= OCFS_LOG_SECTOR_SIZE;
+
+ ocfs_extent_map_remove ((ocfs_extent_map *) Map, (__s64) Vbo,
+ (__s64) ByteCount);
+
+ LOG_EXIT ();
+ return;
+} /* ocfs_remove_extent_map_entry */
+
+
+/*
* ocfs_delete_all_extent_maps()
*
*/
@@ -464,32 +489,7 @@
} /* ocfs_delete_all_extent_maps */
-
/*
- * ocfs_remove_extent_map_entry()
- *
- * Remove an entry from the extent map
- */
-void ocfs_remove_extent_map_entry (ocfs_super * osb, ocfs_extent_map * Map, __s64 Vbo, __u32 ByteCount)
-{
- LOG_ENTRY ();
-
- if ((ByteCount) && (ByteCount != 0xFFFFFFFF)) {
- ByteCount--;
- ByteCount >>= OCFS_LOG_SECTOR_SIZE;
- ByteCount++;
- }
-
- Vbo >>= OCFS_LOG_SECTOR_SIZE;
-
- ocfs_extent_map_remove ((ocfs_extent_map *) Map, (__s64) Vbo,
- (__s64) ByteCount);
-
- LOG_EXIT ();
- return;
-} /* ocfs_remove_extent_map_entry */
-
-/*
* ocfs_get_next_extent_map_entry()
*
* This routine looks up the existing mapping of VBO to LBO for a file.
Modified: trunk/src/hash.c
===================================================================
--- trunk/src/hash.c 2004-05-08 00:22:23 UTC (rev 907)
+++ trunk/src/hash.c 2004-05-10 15:49:54 UTC (rev 908)
@@ -48,22 +48,22 @@
/* bh semaphore hashtable stuff */
-ocfs_bh_sem * ocfs_bh_sem_alloc()
+static ocfs_bh_sem *ocfs_bh_sem_alloc(void)
{
return kmem_cache_alloc(OcfsGlobalCtxt.bh_sem_cache, GFP_NOFS);
}
-void ocfs_bh_sem_free(ocfs_bh_sem *sem)
+static void ocfs_bh_sem_free(ocfs_bh_sem *sem)
{
kmem_cache_free(OcfsGlobalCtxt.bh_sem_cache, sem);
}
-void ocfs_bh_sem_get(ocfs_bh_sem *sem)
+static void ocfs_bh_sem_get(ocfs_bh_sem *sem)
{
atomic_inc(&sem->s_refcnt);
}
-void ocfs_bh_sem_put(ocfs_bh_sem *sem)
+static void ocfs_bh_sem_put(ocfs_bh_sem *sem)
{
if (atomic_dec_and_lock(&sem->s_refcnt, &OcfsGlobalCtxt.bh_sem_hash_lock)) {
if (buffer_modified(sem->s_bh)) {
@@ -76,12 +76,12 @@
}
}
-void ocfs_bh_sem_down(ocfs_bh_sem *sem)
+static void ocfs_bh_sem_down(ocfs_bh_sem *sem)
{
down(&sem->s_sem);
}
-void ocfs_bh_sem_up(ocfs_bh_sem *sem)
+static void ocfs_bh_sem_up(ocfs_bh_sem *sem)
{
up(&sem->s_sem);
}
@@ -137,7 +137,7 @@
}
-ocfs_bh_sem * ocfs_bh_sem_lookup(struct buffer_head *bh)
+static ocfs_bh_sem * ocfs_bh_sem_lookup(struct buffer_head *bh)
{
int depth, bucket;
struct list_head *head, *iter = NULL;
Modified: trunk/src/inc/proto.h
===================================================================
--- trunk/src/inc/proto.h 2004-05-08 00:22:23 UTC (rev 907)
+++ trunk/src/inc/proto.h 2004-05-10 15:49:54 UTC (rev 908)
@@ -38,14 +38,9 @@
int ocfs_lookup_obj_for_proc (ocfs_vote_obj *obj, ocfs_vote_obj_lookup_data *data);
int ocfs_lookup_obj_by_lockid (ocfs_vote_obj *obj, ocfs_vote_obj_lookup_data *data);
-int ocfs_lookup_obj_by_seq (ocfs_vote_obj *obj, ocfs_vote_obj_lookup_data *data);
int ocfs_lookup_vote_request_obj (ocfs_super *osb, ocfs_vote_obj_lookup_data *data);
-int ocfs_wait_for_disk_lock_release (ocfs_super * osb, __u64 offset, __u32 time_to_wait, __u32 lock_type);
-int ocfs_disk_reset_voting (ocfs_super * osb, __u64 lock_id, __u32 lock_type);
-void ocfs_init_dlm_msg (ocfs_super * osb, ocfs_dlm_msg * dlm_msg, __u32 msg_len, __u32 type);
-
int ocfs_update_lockres (ocfs_super * osb, __u64 lock_id, struct buffer_head **bh, __u32 * updated, __u32 timeout, struct inode *inode,int reread);
int ocfs_acquire_lockres (ocfs_lock_res * lockres, __u32 timeout);
void ocfs_release_lockres (ocfs_lock_res * lockres);
@@ -66,7 +61,6 @@
void ocfs_extent_map_init (ocfs_extent_map * map);
void ocfs_extent_map_destroy (ocfs_extent_map * map);
void ocfs_delete_all_extent_maps (ocfs_super * osb, struct inode * oin);
-void ocfs_remove_extent_map_entry (ocfs_super * osb, ocfs_extent_map * Map, __s64 Vbo, __u32 ByteCount);
int ocfs_get_next_extent_map_entry (ocfs_super * osb, ocfs_extent_map * Map, __u32 RunIndex, __s64 * Vbo, __s64 * Lbo, __u32 * SectorCount);
int ocfs_lookup_extent_map_entry (ocfs_super * osb, ocfs_extent_map * Map, __s64 Vbo, __s64 * Lbo, __u64 * SectorCount, __u32 * Index);
int ocfs_update_extent_map (ocfs_super * osb, ocfs_extent_map * Map, void *Buffer, __s64 * localVbo, __u64 * remainingLength, ocfs_ext_flag Flag);
@@ -88,14 +82,8 @@
int ocfs_getattr (struct dentry *dentry, struct iattr *attr);
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-int ocfs_find_actor (struct inode *inode, void *opaque);
-int ocfs_init_locked_inode (struct inode * inode, void * opaque);
-#endif
-
int ocfs_inode_init_private(struct inode *inode);
void ocfs_populate_inode (struct inode *inode, ocfs_file_entry *fe, umode_t mode,int create_ino);
-void ocfs_read_locked_inode (struct inode *inode, ocfs_find_inode_args *args);
void ocfs_read_inode2 (struct inode *inode, void *opaque);
void ocfs_read_inode (struct inode *inode);
void ocfs_put_inode (struct inode *inode);
@@ -114,13 +102,6 @@
int ocfs_bh_sem_lock(struct buffer_head *bh);
int ocfs_bh_sem_unlock(struct buffer_head *bh);
int ocfs_bh_sem_hash_cleanup_pid(pid_t pid);
-void ocfs_bh_sem_up(ocfs_bh_sem *sem);
-void ocfs_bh_sem_down(ocfs_bh_sem *sem);
-void ocfs_bh_sem_put(ocfs_bh_sem *sem);
-void ocfs_bh_sem_get(ocfs_bh_sem *sem);
-void ocfs_bh_sem_free(ocfs_bh_sem *sem);
-ocfs_bh_sem * ocfs_bh_sem_alloc(void);
-ocfs_bh_sem * ocfs_bh_sem_lookup(struct buffer_head *bh);
void wait_on_buffer_modified(struct buffer_head * bh);
void ocfs_clear_buffer_modified(struct buffer_head *bh);
@@ -209,11 +190,6 @@
void ocfs_set_bits (ocfs_alloc_bm * bitmap, __u32 start, __u32 num);
void ocfs_clear_bits (ocfs_alloc_bm * bitmap, __u32 start, __u32 num);
-void ocfs_volcfg_gblctxt_to_disknode(ocfs_node_config_info *disk);
-void ocfs_volcfg_gblctxt_to_node(BARF_BARF_BARF *node);
-
-int ocfs_config_with_disk_lock (ocfs_super * osb, __u64 lock_off, __u8 * cfg_buf, __u32 node_num, ocfs_volcfg_op op);
-
int ocfs_get_config (ocfs_super * osb);
int ocfs_chk_update_config (ocfs_super * osb);
@@ -222,14 +198,14 @@
__u64 ocfs_file_to_disk_off (ocfs_super * osb, __u32 FileId, __u64 Offset);
void ocfs_initialize_dir_node (ocfs_super * osb, ocfs_dir_node * dir_node, __u64 bitmap_off, __u64 file_off, __u32 node);
-int ocfs_write_dir_node (ocfs_super * osb, struct buffer_head *bhs[], __s32 idx, struct inode *dir_inode, struct inode *file_inode);
int ocfs_compare_qstr (struct qstr * s1, struct qstr * s2);
void ocfs_truncate_inode_pages(struct inode *inode, loff_t off);
int ocfs_process_bitmap_free_head(ocfs_super *osb, ocfs_bitmap_free_head *f);
-int ocfs_add_to_bitmap_free_head(ocfs_super *osb, ocfs_bitmap_free_head *f,
- __u32 len, __u32 fileoff, __u32 nodenum,
- __u32 type);
+int ocfs_add_to_bitmap_free_head(ocfs_super *osb,
+ ocfs_bitmap_free_head *f,
+ __u32 len, __u32 fileoff,
+ __u32 nodenum, __u32 type);
int ocfs_empty (struct dentry *dentry);
@@ -264,7 +240,6 @@
int ocfs_recover_dir_node (ocfs_super * osb, __u64 OrigDirNodeOffset, __u64 SavedDirNodeOffset);
int ocfs_remove_file (ocfs_super * osb, struct buffer_head *febh, struct buffer_head *lockbh, ocfs_journal_handle *handle, struct inode *dir_inode, struct inode *file_inode);
-int ocfs_send_bcast (ocfs_super * osb, __u64 votemap, ocfs_dlm_msg * dlm_msg);
void ocfs_recover_oin_locks(ocfs_super *osb, __u32 node_num);
@@ -309,7 +284,6 @@
void ocfs_show_stack(unsigned long * esp);
void ocfs_show_trace(unsigned long * stack);
-void ocfs_put_vote_obj (ocfs_vote_obj *obj);
void ocfs_get_vote_obj (ocfs_vote_obj *obj);
#endif /* _PROTO_H_ */
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-05-08 00:22:23 UTC (rev 907)
+++ trunk/src/inode.c 2004-05-10 15:49:54 UTC (rev 908)
@@ -40,6 +40,9 @@
static sector_t ocfs_bmap(struct address_space *mapping, sector_t block);
static int ocfs_writepage (struct page *page, struct writeback_control *wbc);
static int ocfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t offset, unsigned long nr_segs);
+static int ocfs_init_locked_inode(struct inode * inode, void * opaque);
+static int ocfs_find_actor (struct inode *inode, void *opaque);
+static void ocfs_read_locked_inode (struct inode *inode, ocfs_find_inode_args *args);
#else /* 2.4 kernel */
static int ocfs_find_inode (struct inode *inode, unsigned long ino, void *opaque);
static int ocfs_bmap(struct address_space *mapping, long block);
@@ -455,7 +458,7 @@
* by this point, i_sb, i_dev, i_ino are filled in
*
*/
-void ocfs_read_locked_inode (struct inode *inode, ocfs_find_inode_args *args)
+static void ocfs_read_locked_inode (struct inode *inode, ocfs_find_inode_args *args)
{
__ocfs_read_inode2(inode, args);
return;
@@ -599,7 +602,7 @@
*
* This is the iget5_locked helper function. It used to be ocfs_find_inode()
*/
-int ocfs_find_actor (struct inode *inode, void *opaque)
+static int ocfs_find_actor (struct inode *inode, void *opaque)
{
ocfs_find_inode_args *args = NULL;
int ret = 0;
@@ -636,7 +639,7 @@
* us to sleep.
* return 0 on success, 1 on failure
*/
-int ocfs_init_locked_inode(struct inode * inode, void * opaque)
+static int ocfs_init_locked_inode(struct inode * inode, void * opaque)
{
ocfs_find_inode_args *args = (ocfs_find_inode_args *) opaque;
LOG_ENTRY_ARGS("inode = %p, opaque = %p\n", inode, opaque);
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-05-08 00:22:23 UTC (rev 907)
+++ trunk/src/journal.c 2004-05-10 15:49:54 UTC (rev 908)
@@ -1547,9 +1547,6 @@
*
* called by: old_ocfs_recover_vol()
*
- * NOTE: This function is very similar to ocfs_disk_reset_voting().
- * This function should replace the other one.
- *
* NOTE: This function is unused. I keep it here because it may be
* useful in the future. --Mark (Sept. 22, 2003)
*/
Modified: trunk/src/volcfg.c
===================================================================
--- trunk/src/volcfg.c 2004-05-08 00:22:23 UTC (rev 907)
+++ trunk/src/volcfg.c 2004-05-10 15:49:54 UTC (rev 908)
@@ -40,6 +40,8 @@
static int ocfs_refresh_node_config (ocfs_super * osb);
static void ocfs_show_all_node_cfgs (ocfs_super * osb);
static int ocfs_disknode_to_node (BARF_BARF_BARF ** node, ocfs_node_config_info * disk);
+static void ocfs_volcfg_gblctxt_to_node(BARF_BARF_BARF *node);
+static void ocfs_volcfg_gblctxt_to_disknode(ocfs_node_config_info *disk);
/*
* ocfs_worker()
@@ -293,7 +295,7 @@
*
* Returns 0 if success, < 0 if error.
*/
-int ocfs_config_with_disk_lock (ocfs_super * osb, __u64 lock_off, __u8 * cfg_buf, __u32 node_num, ocfs_volcfg_op op)
+static int ocfs_config_with_disk_lock (ocfs_super * osb, __u64 lock_off, __u8 * cfg_buf, __u32 node_num, ocfs_volcfg_op op)
{
int status = 0;
char *lock_buf = NULL;
@@ -667,7 +669,7 @@
* ocfs_volcfg_gblctxt_to_disknode()
*
*/
-void ocfs_volcfg_gblctxt_to_disknode(ocfs_node_config_info *disk)
+static void ocfs_volcfg_gblctxt_to_disknode(ocfs_node_config_info *disk)
{
ocfs_ipc_config_info *ipc;
ocfs_comm_info *g_ipc;
@@ -698,7 +700,7 @@
* ocfs_volcfg_gblctxt_to_node()
*
*/
-void ocfs_volcfg_gblctxt_to_node(BARF_BARF_BARF *node)
+static void ocfs_volcfg_gblctxt_to_node(BARF_BARF_BARF *node)
{
ocfs_ipc_config_info *ipc;
ocfs_comm_info *g_ipc;
Modified: trunk/src/vote.c
===================================================================
--- trunk/src/vote.c 2004-05-08 00:22:23 UTC (rev 907)
+++ trunk/src/vote.c 2004-05-10 15:49:54 UTC (rev 908)
@@ -40,12 +40,13 @@
static int ocfs_check_ipc_msg (__u8 * msg, __u32 msg_len);
static int ocfs_comm_process_vote_reply (ocfs_super * osb, ocfs_dlm_msg * dlm_msg);
static int ocfs_comm_process_msg (__u8 * msg);
+static void ocfs_init_dlm_msg (ocfs_super * osb, ocfs_dlm_msg * dlm_msg, __u32 msg_len, __u32 type);
static spinlock_t vote_obj_lock = SPIN_LOCK_UNLOCKED;
-void ocfs_put_vote_obj (ocfs_vote_obj *obj)
+static void ocfs_put_vote_obj (ocfs_vote_obj *obj)
{
spin_lock(&vote_obj_lock);
if (atomic_dec_and_test(&obj->refcount))
@@ -134,7 +135,7 @@
* ocfs_send_bcast()
*
*/
-int ocfs_send_bcast (ocfs_super * osb, __u64 votemap, ocfs_dlm_msg * dlm_msg)
+static int ocfs_send_bcast (ocfs_super * osb, __u64 votemap, ocfs_dlm_msg * dlm_msg)
{
int status = 0, error;
__u32 map, num;
@@ -445,7 +446,7 @@
return status;
}
-int ocfs_lookup_obj_by_seq (ocfs_vote_obj *obj, ocfs_vote_obj_lookup_data *data)
+static int ocfs_lookup_obj_by_seq (ocfs_vote_obj *obj, ocfs_vote_obj_lookup_data *data)
{
int status = -ENOENT;
ocfs_dlm_msg *dlm_msg = NULL;
@@ -742,7 +743,7 @@
* ocfs_init_dlm_msg()
*
*/
-void ocfs_init_dlm_msg (ocfs_super * osb, ocfs_dlm_msg * dlm_msg, __u32 msg_len, __u32 type)
+static void ocfs_init_dlm_msg (ocfs_super * osb, ocfs_dlm_msg * dlm_msg, __u32 msg_len, __u32 type)
{
LOG_ENTRY ();
More information about the Ocfs2-commits
mailing list