/*
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
*/
#ifndef __INCORE_DOT_H__
struct gfs2_log_operations;
struct gfs2_log_element;
-struct gfs2_bitmap;
-struct gfs2_rgrpd;
-struct gfs2_bufdata;
-struct gfs2_glock_operations;
struct gfs2_holder;
struct gfs2_glock;
-struct gfs2_alloc;
-struct gfs2_inode;
-struct gfs2_file;
-struct gfs2_revoke;
-struct gfs2_revoke_replay;
-struct gfs2_unlinked;
struct gfs2_quota_data;
-struct gfs2_log_buf;
struct gfs2_trans;
struct gfs2_ail;
struct gfs2_jdesc;
-struct gfs2_args;
-struct gfs2_tune;
struct gfs2_gl_hash_bucket;
struct gfs2_sbd;
struct gfs2_log_descriptor *ld, __be64 *ptr,
int pass);
void (*lo_after_scan) (struct gfs2_jdesc *jd, int error, int pass);
- char *lo_name;
+ const char *lo_name;
};
struct gfs2_log_element {
struct list_head le_list;
- struct gfs2_log_operations *le_ops;
+ const struct gfs2_log_operations *le_ops;
};
struct gfs2_bitmap {
void (*go_unlock) (struct gfs2_holder * gh);
void (*go_callback) (struct gfs2_glock * gl, unsigned int state);
void (*go_greedy) (struct gfs2_glock * gl);
- int go_type;
+ const int go_type;
};
enum {
HIF_DEALLOC = 5,
HIF_HOLDER = 6,
HIF_FIRST = 7,
- HIF_RECURSE = 8,
HIF_ABORTED = 9,
};
struct gfs2_glock *gh_gl;
struct task_struct *gh_owner;
unsigned int gh_state;
- int gh_flags;
+ unsigned gh_flags;
int gh_error;
unsigned long gh_iflags;
struct completion gh_wait;
+ unsigned long gh_ip;
};
enum {
GLF_LOCK = 1,
GLF_STICKY = 2,
GLF_PREFETCH = 3,
- GLF_SYNC = 4,
GLF_DIRTY = 5,
GLF_SKIP_WAITERS2 = 6,
GLF_GREEDY = 7,
spinlock_t gl_spin;
unsigned int gl_state;
+ struct task_struct *gl_owner;
+ unsigned long gl_ip;
struct list_head gl_holders;
struct list_head gl_waiters1; /* HIF_MUTEX */
struct list_head gl_waiters2; /* HIF_DEMOTE, HIF_GREEDY */
struct list_head gl_waiters3; /* HIF_PROMOTE */
- struct gfs2_glock_operations *gl_ops;
+ const struct gfs2_glock_operations *gl_ops;
struct gfs2_holder *gl_req_gh;
gfs2_glop_bh_t gl_req_bh;
struct gfs2_alloc {
/* Quota stuff */
+ struct gfs2_quota_data *al_qd[2*MAXQUOTAS];
+ struct gfs2_holder al_qd_ghs[2*MAXQUOTAS];
unsigned int al_qd_num;
- struct gfs2_quota_data *al_qd[4];
- struct gfs2_holder al_qd_ghs[4];
- /* Filled in by the caller to gfs2_inplace_reserve() */
-
- uint32_t al_requested;
+ u32 al_requested; /* Filled in by caller of gfs2_inplace_reserve() */
+ u32 al_alloced; /* Filled in by gfs2_alloc_*() */
/* Filled in by gfs2_inplace_reserve() */
- char *al_file;
unsigned int al_line;
+ char *al_file;
struct gfs2_holder al_ri_gh;
struct gfs2_holder al_rgd_gh;
struct gfs2_rgrpd *al_rgd;
- /* Filled in by gfs2_alloc_*() */
-
- uint32_t al_alloced;
};
enum {
- GIF_MIN_INIT = 0,
GIF_QD_LOCKED = 1,
GIF_PAGED = 2,
GIF_SW_PAGED = 3,
};
struct gfs2_inode {
+ struct inode i_inode;
struct gfs2_inum i_num;
- atomic_t i_count;
unsigned long i_flags; /* GIF_... */
uint64_t i_vn;
- struct gfs2_dinode i_di;
-
- struct gfs2_glock *i_gl;
- struct gfs2_sbd *i_sbd;
- struct inode *i_vnode;
+ struct gfs2_dinode i_di; /* To be replaced by ref to block */
+ struct gfs2_glock *i_gl; /* Move into i_gh? */
struct gfs2_holder i_iopen_gh;
struct gfs2_holder i_gh; /* for prepare/commit_write only */
struct gfs2_alloc i_alloc;
spinlock_t i_spin;
struct rw_semaphore i_rw_mutex;
-
unsigned int i_greedy;
unsigned long i_last_pfault;
struct buffer_head *i_cache[GFS2_MAX_META_HEIGHT];
};
+/*
+ * Since i_inode is the first element of struct gfs2_inode,
+ * this is effectively a cast.
+ */
+static inline struct gfs2_inode *GFS2_I(struct inode *inode)
+{
+ return container_of(inode, struct gfs2_inode, i_inode);
+}
+
+/* To be removed? */
+static inline struct gfs2_sbd *GFS2_SB(struct inode *inode)
+{
+ return inode->i_sb->s_fs_info;
+}
+
enum {
GFF_DID_DIRECT_ALLOC = 0,
+ GFF_EXLOCK = 1,
};
struct gfs2_file {
unsigned long f_flags; /* GFF_... */
-
struct mutex f_fl_mutex;
struct gfs2_holder f_fl_gh;
-
- struct gfs2_inode *f_inode;
- struct file *f_vfile;
};
struct gfs2_revoke {
unsigned int rr_where;
};
-enum {
- ULF_LOCKED = 0,
-};
-
-struct gfs2_unlinked {
- struct list_head ul_list;
- unsigned int ul_count;
- struct gfs2_unlinked_tag ul_ut;
- unsigned long ul_flags; /* ULF_... */
- unsigned int ul_slot;
-};
-
enum {
QDF_USER = 0,
QDF_CHANGE = 1,
QDF_LOCKED = 2,
};
+struct gfs2_quota_lvb {
+ __be32 qb_magic;
+ u32 __pad;
+ __be64 qb_limit; /* Hard limit of # blocks to alloc */
+ __be64 qb_warn; /* Warn user when alloc is above this # */
+ __be64 qb_value; /* Current # blocks allocated */
+};
+
struct gfs2_quota_data {
struct list_head qd_list;
unsigned int qd_count;
};
struct gfs2_trans {
- char *tr_file;
- unsigned int tr_line;
+ unsigned long tr_ip;
unsigned int tr_blocks;
unsigned int tr_revokes;
unsigned int tr_reserved;
- struct gfs2_holder *tr_t_gh;
+ struct gfs2_holder tr_t_gh;
int tr_touched;
unsigned int gt_recoverd_secs;
unsigned int gt_logd_secs;
unsigned int gt_quotad_secs;
- unsigned int gt_inoded_secs;
unsigned int gt_quota_simul_sync; /* Max quotavals to sync at once */
unsigned int gt_quota_warn_period; /* Secs between quota warn msgs */
struct gfs2_sbd {
struct super_block *sd_vfs;
+ struct super_block *sd_vfs_meta;
struct kobject sd_kobj;
unsigned long sd_flags; /* SDF_... */
struct gfs2_sb sd_sb;
uint32_t sd_hash_bsize; /* sizeof(exhash block) */
uint32_t sd_hash_bsize_shift;
uint32_t sd_hash_ptrs; /* Number of pointers in a hash block */
- uint32_t sd_ut_per_block;
uint32_t sd_qc_per_block;
uint32_t sd_max_dirres; /* Max blocks needed to add a directory entry */
uint32_t sd_max_height; /* Max height of a file's metadata tree */
struct gfs2_holder sd_live_gh;
struct gfs2_glock *sd_rename_gl;
struct gfs2_glock *sd_trans_gl;
- struct mutex sd_invalidate_inodes_mutex;
/* Inode Stuff */
struct inode *sd_statfs_inode;
struct inode *sd_ir_inode;
struct inode *sd_sc_inode;
- struct inode *sd_ut_inode;
struct inode *sd_qc_inode;
struct inode *sd_rindex;
struct inode *sd_quota_inode;
- struct inode *sd_root_dir;
/* Inum stuff */
struct gfs2_holder sd_ir_gh;
struct gfs2_holder sd_sc_gh;
- struct gfs2_holder sd_ut_gh;
struct gfs2_holder sd_qc_gh;
/* Daemon stuff */
struct task_struct *sd_recoverd_process;
struct task_struct *sd_logd_process;
struct task_struct *sd_quotad_process;
- struct task_struct *sd_inoded_process;
struct task_struct *sd_glockd_process[GFS2_GLOCKD_MAX];
unsigned int sd_glockd_num;
- /* Unlinked inode stuff */
-
- struct list_head sd_unlinked_list;
- atomic_t sd_unlinked_count;
- spinlock_t sd_unlinked_spin;
- struct mutex sd_unlinked_mutex;
-
- unsigned int sd_unlinked_slots;
- unsigned int sd_unlinked_chunks;
- unsigned char **sd_unlinked_bitmap;
-
/* Quota stuff */
struct list_head sd_quota_list;
/* Log stuff */
spinlock_t sd_log_lock;
- atomic_t sd_log_trans_count;
- wait_queue_head_t sd_log_trans_wq;
- atomic_t sd_log_flush_count;
- wait_queue_head_t sd_log_flush_wq;
unsigned int sd_log_blks_reserved;
unsigned int sd_log_commited_buf;
unsigned int sd_log_num_rg;
unsigned int sd_log_num_databuf;
unsigned int sd_log_num_jdata;
+ unsigned int sd_log_num_hdrs;
struct list_head sd_log_le_gl;
struct list_head sd_log_le_buf;
struct list_head sd_log_le_databuf;
unsigned int sd_log_blks_free;
- struct list_head sd_log_blks_list;
- wait_queue_head_t sd_log_blks_wait;
+ struct mutex sd_log_reserve_mutex;
uint64_t sd_log_sequence;
unsigned int sd_log_head;
unsigned int sd_log_tail;
- uint64_t sd_log_wraps;
int sd_log_idle;
unsigned long sd_log_flush_time;
- struct mutex sd_log_flush_lock;
+ struct rw_semaphore sd_log_flush_lock;
struct list_head sd_log_flush_list;
unsigned int sd_log_flush_head;
/* Debugging crud */
unsigned long sd_last_warning;
+ struct vfsmount *sd_gfs2mnt;
};
#endif /* __INCORE_DOT_H__ */
projects / linux-2.6-omap-h63xx.git / blobdiff