[Ocfs2-commits] mfasheh commits r1699 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Dec 8 17:38:05 CST 2004
Author: mfasheh
Date: 2004-12-08 17:38:03 -0600 (Wed, 08 Dec 2004)
New Revision: 1699
Modified:
trunk/src/file.c
trunk/src/inode.c
trunk/src/inode.h
trunk/src/namei.c
trunk/src/ocfs.h
trunk/src/ocfs_journal.h
trunk/src/ocfs_log.h
trunk/src/super.c
trunk/src/sysfile.c
trunk/src/sysfile.h
Log:
* don't use __ types in files that aren't shared with userspace.
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-12-08 23:11:23 UTC (rev 1698)
+++ trunk/src/file.c 2004-12-08 23:38:03 UTC (rev 1699)
@@ -223,7 +223,7 @@
struct dentry *dentry = filp->f_dentry;
struct inode *inode = dentry->d_inode;
int status;
- __u64 newsize;
+ u64 newsize;
struct super_block *sb = inode->i_sb;
int do_direct_io = 0;
int sector_size;
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-12-08 23:11:23 UTC (rev 1698)
+++ trunk/src/inode.c 2004-12-08 23:38:03 UTC (rev 1699)
@@ -1032,7 +1032,7 @@
inode->i_uid = fe->i_uid;
inode->i_gid = fe->i_gid;
inode->i_mode = fe->i_mode;
- inode->i_blksize = (__u32) osb->s_clustersize;
+ inode->i_blksize = (u32) osb->s_clustersize;
OCFS_SET_INODE_TIME(inode, i_ctime, fe->i_ctime);
OCFS_SET_INODE_TIME(inode, i_atime, fe->i_atime);
OCFS_SET_INODE_TIME(inode, i_mtime, fe->i_mtime);
Modified: trunk/src/inode.h
===================================================================
--- trunk/src/inode.h 2004-12-08 23:11:23 UTC (rev 1698)
+++ trunk/src/inode.h 2004-12-08 23:38:03 UTC (rev 1699)
@@ -30,8 +30,8 @@
int *err, int reada);
void ocfs_clear_inode(struct inode *inode);
void ocfs_delete_inode(struct inode *inode);
-struct inode *ocfs_iget(ocfs_super *osb, __u64 feoff);
-struct inode *ocfs_ilookup(ocfs_super *osb, __u64 feoff);
+struct inode *ocfs_iget(ocfs_super *osb, u64 feoff);
+struct inode *ocfs_ilookup(ocfs_super *osb, u64 feoff);
int ocfs_inode_init_private(struct inode *inode);
int ocfs_inode_revalidate(struct dentry *dentry);
int ocfs_populate_inode(struct inode *inode, ocfs2_dinode *fe,
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-12-08 23:11:23 UTC (rev 1698)
+++ trunk/src/namei.c 2004-12-08 23:38:03 UTC (rev 1699)
@@ -263,7 +263,7 @@
{
int status = 0;
struct buffer_head *parent_fe_bh = NULL;
- __u64 file_off;
+ u64 file_off;
ocfs_journal_handle *handle = NULL;
ocfs_super *osb;
ocfs2_dinode *fe = NULL;
@@ -1469,7 +1469,7 @@
{
ocfs_super *osb = NULL;
struct inode *inode = NULL;
- __u64 newsize;
+ u64 newsize;
int status;
struct super_block *sb;
int l;
Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h 2004-12-08 23:11:23 UTC (rev 1698)
+++ trunk/src/ocfs.h 2004-12-08 23:38:03 UTC (rev 1699)
@@ -116,7 +116,7 @@
#define OCFS_NODE_MAP_MAX_NODES 256
typedef struct _ocfs_node_map
{
- __u16 num_nodes;
+ u16 num_nodes;
unsigned long map[BITS_TO_LONGS(OCFS_NODE_MAP_MAX_NODES)];
} ocfs_node_map;
@@ -313,7 +313,7 @@
struct _ocfs_super
{
struct list_head osb_next; /* list of ocfs_super(s) */
- __u32 osb_id; /* id used by the proc interface */
+ u32 osb_id; /* id used by the proc interface */
ocfs_commit_task *commit;
struct super_block *sb;
struct inode *root_inode;
@@ -414,12 +414,12 @@
struct list_head osb_next; /* List of all volumes */
kmem_cache_t *inode_cache;
kmem_cache_t *lock_cache;
- __u32 flags;
+ u32 flags;
char *node_name; /* human readable node identification */
char *cluster_name; /* unused */
int comm_info_read; /* ipc info loaded from config file */
spinlock_t comm_seq_lock; /* protects comm_seq_num */
- __u64 comm_seq_num; /* local node seq num used in ipcdlm */
+ u64 comm_seq_num; /* local node seq num used in ipcdlm */
ocfs_dlm_stats net_reqst_stats; /* stats of netdlm vote requests */
ocfs_dlm_stats net_reply_stats; /* stats of netdlm vote reponses */
struct proc_dir_entry *proc_root_dir; /* points to /proc/fs/ocfs2 */
@@ -435,7 +435,7 @@
{
char name[255]; /* "OCFS" */
char version[255]; /* version */
- __u16 nodenum; /* node number */
+ u16 nodenum; /* node number */
char nodename[255]; /* node name */
};
Modified: trunk/src/ocfs_journal.h
===================================================================
--- trunk/src/ocfs_journal.h 2004-12-08 23:11:23 UTC (rev 1698)
+++ trunk/src/ocfs_journal.h 2004-12-08 23:38:03 UTC (rev 1699)
@@ -49,7 +49,7 @@
journal_t *k_journal; /* The kernels journal type */
struct inode *k_inode; /* Kernel inode pointing to
* this journal */
- __u8 version; /* Journal version */
+ u8 version; /* Journal version */
struct _ocfs_super *osb; /* pointer to the super
* block for the node
* we're currently
@@ -146,7 +146,7 @@
handle_t *k_handle; /* kernel handle. */
ocfs_journal *journal;
struct _ocfs_super *osb; /* what super block we belong to */
- __u32 flags; /* see flags below. */
+ u32 flags; /* see flags below. */
struct list_head h_list; /* points to whatever list we're
* on. */
int max_buffs; /* Buffs reserved by this handle */
Modified: trunk/src/ocfs_log.h
===================================================================
--- trunk/src/ocfs_log.h 2004-12-08 23:11:23 UTC (rev 1698)
+++ trunk/src/ocfs_log.h 2004-12-08 23:38:03 UTC (rev 1699)
@@ -26,16 +26,16 @@
#ifndef OCFS_LOG_H
#define OCFS_LOG_H
-extern __u32 debug_context;
-extern __u32 debug_level;
-extern __u32 debug_exclude;
+extern u32 debug_context;
+extern u32 debug_level;
+extern u32 debug_exclude;
#ifndef TRACE
#undef EVIL_TRACE
#endif
#ifdef EVIL_TRACE
-extern __u64 debug_mask;
+extern u64 debug_mask;
enum {
OCFS_TRACE_CREATE=1,
@@ -128,8 +128,8 @@
#ifdef OCFS_DBG_TIMING
typedef union _my_timing_t
{
- __u64 q;
- __u32 lohi[2];
+ u64 q;
+ u32 lohi[2];
} my_timing_t;
#define IO_FUNC_TIMING_DECL my_timing_t begin, end; rdtsc (begin.lohi[0], begin.lohi[1]);
@@ -154,7 +154,7 @@
#define PRINT_STRING(__t) printk("\n");
#define PRINT_ENTRY(__t) printk("(%d) ENTRY: %s", current->pid, __FUNCTION__)
#else
-#define DECL_U8_ARRAY(__t, __s) __u8 (__t)[(__s)]
+#define DECL_U8_ARRAY(__t, __s) u8 (__t)[(__s)]
#define INIT_U8_ARRAY(__s) *(__s) = '\0'
#define PRINT_STRING(__t) printk("%s\n", (__t))
#define PRINT_ENTRY(__t) printk("(%d) %sENTRY: %s", current->pid, (__t), __FUNCTION__)
@@ -193,16 +193,16 @@
# define ENTRY_TIMING_DECLS
# define GET_TIMING(s, hi, lo)
#else
-# define ENTRY_TIMING_DECLS __u32 _HI = 0, _LO = 0
+# define ENTRY_TIMING_DECLS u32 _HI = 0, _LO = 0
# define GET_TIMING(s, hi, lo) \
do { \
IF_LEVEL_CONTEXT(OCFS_DEBUG_LEVEL_TIMING) { \
- __u32 _lo, _hi; \
+ u32 _lo, _hi; \
rdtsc (_lo, _hi); \
if ((s) == NULL) { \
(hi) = _hi; (lo) = _lo; \
} else { \
- __u64 _b, _e; \
+ u64 _b, _e; \
_b = hi; _b <<= 32; _b |= lo; \
_e = _hi; _e <<= 32; _e |= _lo; \
_e -= _b; \
Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c 2004-12-08 23:11:23 UTC (rev 1698)
+++ trunk/src/super.c 2004-12-08 23:38:03 UTC (rev 1699)
@@ -78,14 +78,14 @@
*/
ocfs_global_ctxt OcfsGlobalCtxt;
spinlock_t osb_id_lock;
-__u32 osb_id; /* Keeps track of next available OSB Id */
+u32 osb_id; /* Keeps track of next available OSB Id */
-__u32 debug_context = 0;
-__u32 debug_level = 0;
-__u32 debug_exclude = 0;
+u32 debug_context = 0;
+u32 debug_level = 0;
+u32 debug_exclude = 0;
#ifdef EVIL_TRACE
-__u64 debug_mask = 0;
+u64 debug_mask = 0;
#endif
#if 0
@@ -97,11 +97,11 @@
#define KERN_OCFS 988
static ctl_table ocfs_dbg_table[] = {
- {1, "debug_level", &debug_level, sizeof (__u32), 0644, NULL, &proc_dointvec,
+ {1, "debug_level", &debug_level, sizeof (u32), 0644, NULL, &proc_dointvec,
&sysctl_intvec, NULL, NULL, NULL},
- {2, "debug_context", &debug_context, sizeof (__u32), 0644, NULL, &proc_dointvec,
+ {2, "debug_context", &debug_context, sizeof (u32), 0644, NULL, &proc_dointvec,
&sysctl_intvec, NULL, NULL, NULL},
- {3, "debug_exclude", &debug_exclude, sizeof (__u32), 0644, NULL, &proc_dointvec,
+ {3, "debug_exclude", &debug_exclude, sizeof (u32), 0644, NULL, &proc_dointvec,
&sysctl_intvec, NULL, NULL, NULL},
{0}
};
@@ -136,7 +136,7 @@
#endif /* Linux 2.4 stuff */
-static int ocfs_parse_options (char *options, __u32 * uid, __u32 * gid, int * reclaim_id, char **group_name);
+static int ocfs_parse_options (char *options, u32 * uid, u32 * gid, int * reclaim_id, char **group_name);
static int __init ocfs_driver_entry (void);
static void __exit ocfs_driver_exit (void);
static void ocfs_put_super (struct super_block *sb);
@@ -162,7 +162,7 @@
static int ocfs2_complete_mount_recovery(ocfs_super *osb);
static int ocfs_check_volume(ocfs_super * osb);
static int ocfs_verify_volume(ocfs2_dinode *di, struct buffer_head *bh,
- __u32 sectsize);
+ u32 sectsize);
static int ocfs_initialize_osb(ocfs_super *osb, struct buffer_head *bh);
static int ocfs2_get_sector(struct super_block *sb, struct buffer_head **bh, int block, int sect_size);
static void ocfs_write_super (struct super_block * sb);
@@ -320,8 +320,8 @@
struct dentry *root;
int status;
struct inode *inode = NULL;
- __u32 uid = current->fsuid;
- __u32 gid = current->fsgid;
+ u32 uid = current->fsuid;
+ u32 gid = current->fsgid;
int reclaim_id;
char *group_name = NULL;
ocfs_super *osb = NULL;
@@ -437,7 +437,7 @@
*
* e.g., gid=9999,uid=9999,[no]cache,reclaimid
*/
-static int ocfs_parse_options (char *options, __u32 * uid, __u32 * gid, int * reclaim_id, char **group_name)
+static int ocfs_parse_options (char *options, u32 * uid, u32 * gid, int * reclaim_id, char **group_name)
{
char *c;
char *value;
@@ -669,7 +669,7 @@
static int ocfs_statfs(struct super_block *sb, struct kstatfs *buf)
{
ocfs_super *osb;
- __u32 numbits, freebits;
+ u32 numbits, freebits;
int status, ret = 0;
ocfs2_dinode *bm_lock;
struct buffer_head *bh = NULL;
@@ -1335,7 +1335,7 @@
* 0 on success
*/
static int ocfs_verify_volume(ocfs2_dinode *di, struct buffer_head *bh,
- __u32 blksz)
+ u32 blksz)
{
int status = -EAGAIN;
Modified: trunk/src/sysfile.c
===================================================================
--- trunk/src/sysfile.c 2004-12-08 23:11:23 UTC (rev 1698)
+++ trunk/src/sysfile.c 2004-12-08 23:38:03 UTC (rev 1699)
@@ -46,10 +46,10 @@
/* Tracing */
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_SYSFILE
-static struct inode * _ocfs_get_system_file_inode(ocfs_super *osb, int type, __u32 slot);
+static struct inode * _ocfs_get_system_file_inode(ocfs_super *osb, int type, u32 slot);
static inline int is_global_system_inode(int type);
-static inline int is_in_system_inode_array(ocfs_super *osb, int type, __u32 slot);
+static inline int is_in_system_inode_array(ocfs_super *osb, int type, u32 slot);
static inline int is_global_system_inode(int type)
{
@@ -57,13 +57,13 @@
type <= OCFS2_LAST_GLOBAL_SYSTEM_INODE);
}
-static inline int is_in_system_inode_array(ocfs_super *osb, int type, __u32 slot)
+static inline int is_in_system_inode_array(ocfs_super *osb, int type, u32 slot)
{
return (slot == osb->slot_num || is_global_system_inode(type));
}
struct inode *ocfs_get_system_file_inode(ocfs_super *osb, int type,
- __u32 slot)
+ u32 slot)
{
struct inode *inode = NULL;
struct inode **arr = NULL;
@@ -93,7 +93,7 @@
return inode;
}
-static struct inode * _ocfs_get_system_file_inode(ocfs_super *osb, int type, __u32 slot)
+static struct inode * _ocfs_get_system_file_inode(ocfs_super *osb, int type, u32 slot)
{
char namebuf[40];
struct inode *inode = NULL;
Modified: trunk/src/sysfile.h
===================================================================
--- trunk/src/sysfile.h 2004-12-08 23:11:23 UTC (rev 1698)
+++ trunk/src/sysfile.h 2004-12-08 23:38:03 UTC (rev 1699)
@@ -26,6 +26,6 @@
#ifndef OCFS2_SYSFILE_H
#define OCFS2_SYSFILE_H
-struct inode * ocfs_get_system_file_inode(ocfs_super *osb, int type, __u32 slot);
+struct inode * ocfs_get_system_file_inode(ocfs_super *osb, int type, u32 slot);
#endif /* OCFS2_SYSFILE_H */
More information about the Ocfs2-commits
mailing list