ext4: Move the ext4_i.h header file into ext4.h
Theodore Ts'o
maintainerPATCH 1/4 ext4: Move the ext4_i.h header file into ext4.h
There is no longer a reason for a separate ext4_i.h header file, so move it into ext4.h just to make life easier for developers to find the relevant data structures and typedefs. Should also speed up compiles slightly, too.
--- fs/ext4/ext4.h | 122 ++++++++++++++++++++++++++++++++++++++++++++++- fs/ext4/ext4_i.h | 140 ------------------------------------------------------ 2 files changed, 121 insertions(+), 141 deletions(-) delete mode 100644 fs/ext4/ext4_i.h
fs/ext4/ext4.h +121 -1
@@ -21,7 +21,10 @@#include <linux/magic.h> #include <linux/jbd2.h> #include <linux/quota.h> -#include "ext4_i.h" +#include <linux/rwsem.h> +#include <linux/rbtree.h> +#include <linux/seqlock.h> +#include <linux/mutex.h> /* * The fourth extended filesystem constants/structures
@@ -46,6 +49,19 @@ #define ext4_debug(f, a...) do {} while (0)#endif +/* data type for block offset of block group */ +typedef int ext4_grpblk_t ; + +/* data type for filesystem-wide blocks number */ +typedef unsigned long long ext4_fsblk_t ; + +/* data type for file logical block number */ +typedef __u32 ext4_lblk_t ; + +/* data type for block group number */ +typedef unsigned int ext4_group_t ; + +/* prefer goal again. length */ #define EXT4_MB_HINT_MERGE 1/* blocks already reserved */
@@ -516,6 +532,110 @@ do { \#endif /* defined(__KERNEL__) || defined(__linux__) */ /* +* storage for cached extent +*/ +struct ext4_ext_cache { +ext4_fsblk_t ec_start; +ext4_lblk_t ec_block; +__u32 ec_len;/* must be 32bit to return holes */ +__u32 ec_type; +}; + +/* +* fourth extended file system inode data in memory +*/ +struct ext4_inode_info { +__le32 i_data[15 ];/* unconverted */ +__u32 i_flags; +ext4_fsblk_t i_file_acl; +__u32 i_dtime; + +/* +* i_block_group is the number of the block group which contains +* this file's inode. Constant across the lifetime of the inode, +* it is ued for making block allocation decisions - we try to +* place a file's data blocks near its inode block, and new inodes +* near to their parent directory's inode. +*/ +ext4_group_t i_block_group; +__u32 i_state;/* Dynamic state flags for ext4 */ + +ext4_lblk_t i_dir_start_lookup; +#ifdef CONFIG_EXT4_FS_XATTR +/* +* Extended attributes can be read independently of the main file +* data. Taking i_mutex even when reading would cause contention +* between readers of EAs and writers of regular file data, so +* instead we synchronize on xattr_sem when reading or changing +* EAs. +*/ +struct rw_semaphore xattr_sem; +#endif +#ifdef CONFIG_EXT4_FS_POSIX_ACL +struct posix_acl *i_acl; +struct posix_acl *i_default_acl; +#endif + +struct list_head i_orphan;/* unlinked but open inodes */ + +/* +* i_disksize keeps track of what the inode size is ON DISK, not +* in memory. During truncate, i_size is set to the new size by +* the VFS prior to calling ext4_truncate(), but the filesystem won't +* set i_disksize to 0 until the truncate is actually under way. +* +* The intent is that i_disksize always represents the blocks which +* are used by this file. This allows recovery to restart truncate +* on orphans if we crash during truncate. We actually write i_disksize +* into the on-disk inode when writing inodes out, instead of i_size. +* +* The only time when i_disksize and i_size may be different is when +* a truncate is in progress. The only things which change i_disksize +* are ext4_get_block (growth) and ext4_truncate (shrinkth). +*/ +loff_t i_disksize; + +/* +* i_data_sem is for serialising ext4_truncate() against +* ext4_getblock(). In the 2.4 ext2 design, great chunks of inode's +* data tree are chopped off during truncate. We can't do that in +* ext4 because whenever we perform intermediate commits during +* truncate, the inode and all the metadata blocks *must* be in a +* consistent state which allows truncation of the orphans to restart +* during recovery. Hence we must fix the get_block-vs-truncate race +* by other means, so we have i_data_sem. +*/ +struct rw_semaphore i_data_sem; +struct inode vfs_inode; +struct jbd2_inode jinode; + +struct ext4_ext_cache i_cached_extent; +/* +* File creation time. Its function is same as that of +* struct timespec i_{a,c,m}time in the generic inode. +*/ +struct timespec i_crtime; + +/* mballoc */ +struct list_head i_prealloc_list; +spinlock_t i_prealloc_lock; + +/* ialloc */ +ext4_group_t i_last_alloc_group; + +/* allocation reservation info for delalloc */ +unsigned int i_reserved_data_blocks; +unsigned int i_reserved_meta_blocks; +unsigned int i_allocated_meta_blocks; +unsigned short i_delalloc_reserved_flag; + +/* on-disk additional length */ +__u16 i_extra_isize; + +spinlock_t i_block_reservation_lock; +}; + +/* * File system states */ #define EXT4_VALID_FS 0x0001/* Unmounted cleanly */
fs/ext4/ext4_i.h deleted +0 -138
138 lines not on this page · raw message
Theodore Ts'o
maintainerPATCH 2/4 ext4: Move the ext4_sb.h header file into ext4.h
There is no longer a reason for a separate ext4_sb.h header file, so move it into ext4.h just to make life easier for developers to find the relevant data structures and typedefs. Should also speed up compiles slightly, too.
--- fs/ext4/ext4.h | 145 +++++++++++++++++++++++++++++++++++++++++++++- fs/ext4/ext4_sb.h | 163 ----------------------------------------------------- 2 files changed, 141 insertions(+), 167 deletions(-) delete mode 100644 fs/ext4/ext4_sb.h
fs/ext4/ext4.h +141 -4
@@ -25,6 +25,11 @@#include <linux/rbtree.h> #include <linux/seqlock.h> #include <linux/mutex.h> +#include <linux/timer.h> +#include <linux/wait.h> +#include <linux/rbtree.h> +#include <linux/blockgroup_lock.h> +#include <linux/percpu_counter.h> /* * The fourth extended filesystem constants/structures
@@ -195,9 +200,6 @@ struct flex_groups {#define EXT4_BG_BLOCK_UNINIT 0x0002/* Block bitmap not in use */ #define EXT4_BG_INODE_ZEROED 0x0004/* On-disk itable initialized to zero */ -#ifdef __KERNEL__ -#include "ext4_sb.h" -#endif /* * Macro-instructions used to manage group descriptors */
@@ -809,6 +811,136 @@ struct ext4_super_block { };#ifdef __KERNEL__ +/* +* fourth extended-fs super-block data in memory +*/ +struct ext4_sb_info { +unsigned long s_desc_size;/* Size of a group descriptor in bytes */ +unsigned long s_inodes_per_block;/* Number of inodes per block */ +unsigned long s_blocks_per_group;/* Number of blocks in a group */ +unsigned long s_inodes_per_group;/* Number of inodes in a group */ +unsigned long s_itb_per_group;/* Number of inode table blocks per group */ +unsigned long s_gdb_count;/* Number of group descriptor blocks */ +unsigned long s_desc_per_block;/* Number of group descriptors per block */ +ext4_group_t s_groups_count;/* Number of groups in the fs */ +unsigned long s_overhead_last;/* Last calculated overhead */ +unsigned long s_blocks_last;/* Last seen block count */ +loff_t s_bitmap_maxbytes;/* max bytes for bitmap files */ +struct buffer_head * s_sbh;/* Buffer containing the super block */ +struct ext4_super_block *s_es;/* Pointer to the super block in the buffer */ +struct buffer_head **s_group_desc; +unsigned long s_mount_opt; +ext4_fsblk_t s_sb_block; +uid_t s_resuid; +gid_t s_resgid; +unsigned short s_mount_state; +unsigned short s_pad; +int s_addr_per_block_bits; +int s_desc_per_block_bits; +int s_inode_size; +int s_first_ino; +unsigned int s_inode_readahead_blks; +spinlock_t s_next_gen_lock; +u32 s_next_generation; +u32 s_hash_seed[4 ]; +int s_def_hash_version; +int s_hash_unsigned;/* 3 if hash should be signed, 0 if not */ +struct percpu_counter s_freeblocks_counter; +struct percpu_counter s_freeinodes_counter; +struct percpu_counter s_dirs_counter; +struct percpu_counter s_dirtyblocks_counter; +struct blockgroup_lock *s_blockgroup_lock; +struct proc_dir_entry *s_proc; +struct kobject s_kobj; +struct completion s_kobj_unregister; + +/* Journaling */ +struct inode *s_journal_inode; +struct journal_s *s_journal; +struct list_head s_orphan; +struct mutex s_orphan_lock; +struct mutex s_resize_lock; +unsigned long s_commit_interval; +u32 s_max_batch_time; +u32 s_min_batch_time; +struct block_device *journal_bdev; +#ifdef CONFIG_JBD2_DEBUG +struct timer_list turn_ro_timer;/* For turning read-only (crash simulation) */ +wait_queue_head_t ro_wait_queue;/* For people waiting for the fs to go read-only */ +#endif +#ifdef CONFIG_QUOTA +char *s_qf_names[MAXQUOTAS ];/* Names of quota files with journalled quota */ +int s_jquota_fmt;/* Format of quota to use */ +#endif +unsigned int s_want_extra_isize;/* New inodes should reserve # bytes */ + +#ifdef EXTENTS_STATS +/* ext4 extents stats */ +unsigned long s_ext_min; +unsigned long s_ext_max; +unsigned long s_depth_max; +spinlock_t s_ext_stats_lock; +unsigned long s_ext_blocks; +unsigned long s_ext_extents; +#endif + +/* for buddy allocator */ +struct ext4_group_info ***s_group_info; +struct inode *s_buddy_cache; +long s_blocks_reserved; +spinlock_t s_reserve_lock; +spinlock_t s_md_lock; +tid_t s_last_transaction; +unsigned short *s_mb_offsets; +unsigned int *s_mb_maxs; + +/* tunables */ +unsigned long s_stripe; +unsigned int s_mb_stream_request; +unsigned int s_mb_max_to_scan; +unsigned int s_mb_min_to_scan; +unsigned int s_mb_stats; +unsigned int s_mb_order2_reqs; +unsigned int s_mb_group_prealloc; +/* where last allocation was done - for stream allocation */ +unsigned long s_mb_last_group; +unsigned long s_mb_last_start; + +/* history to debug policy */ +struct ext4_mb_history *s_mb_history; +int s_mb_history_cur; +int s_mb_history_max; +int s_mb_history_num; +spinlock_t s_mb_history_lock; +int s_mb_history_filter; + +/* stats for buddy allocator */ +spinlock_t s_mb_pa_lock; +atomic_t s_bal_reqs;/* number of reqs with len > 1 */ +atomic_t s_bal_success;/* we found long enough chunks */ +atomic_t s_bal_allocated;/* in blocks */ +atomic_t s_bal_ex_scanned;/* total extents scanned */ +atomic_t s_bal_goals;/* goal hits */ +atomic_t s_bal_breaks;/* too long searches */ +atomic_t s_bal_2orders;/* 2^order hits */ +spinlock_t s_bal_lock; +unsigned long s_mb_buddies_generated; +unsigned long long s_mb_generation_time; +atomic_t s_mb_lost_chunks; +atomic_t s_mb_preallocated; +atomic_t s_mb_discarded; + +/* locality groups */ +struct ext4_locality_group *s_locality_groups; + +/* for write statistics */ +unsigned long s_sectors_written_start; +u64 s_kbytes_written; + +unsigned int s_log_groups_per_flex; +struct flex_groups *s_flex_groups; +}; +static inline struct ext4_sb_info *EXT4_SB (struct super_block *sb) {return sb->s_fs_info;
@@ -824,7 +956,6 @@ static inline struct timespec ext4_current_time(struct inode *inode) current_fs_time(inode->i_sb) : CURRENT_TIME_SEC; } -static inline int ext4_valid_inum (struct super_block *sb,unsigned long ino) { return ino == EXT4_ROOT_INO ||
@@ -833,6 +964,12 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) (ino >=EXT4_FIRST_INO (sb) && ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count)); } + +static inline spinlock_t * +sb_bgl_lock (struct ext4_sb_info *sbi,unsigned int block_group) +{ +return bgl_lock_ptr (sbi->s_blockgroup_lock, block_group); +}#else /* Assume that user mode programs are passing in an ext4fs superblock, not * a kernel struct super_block. This will allow us to call the feature-test
fs/ext4/ext4_sb.h deleted +0 -161
161 lines not on this page · raw message
Theodore Ts'o
maintainerPATCH 3/4 ext4: Move fs/ext4/namei.h into ext4.h
The fs/ext4/namei.h header file had only a single function declaration, and should have never been a standalone file. Move it into ext4.h, where should have been from the beginning.
--- fs/ext4/ext4.h | 1 + fs/ext4/namei.c | 1 - fs/ext4/namei.h | 8 -------- fs/ext4/super.c | 1 - 4 files changed, 1 insertions(+), 10 deletions(-) delete mode 100644 fs/ext4/namei.h
fs/ext4/ext4.h +1 -0
@@ -1595,6 +1595,7 @@ extern const struct file_operations ext4_file_operations;/* namei.c */ extern const struct inode_operations ext4_dir_inode_operations;extern const struct inode_operations ext4_special_inode_operations; +extern struct dentry *ext4_get_parent (struct dentry *child);/* symlink.c */ extern const struct inode_operations ext4_symlink_inode_operations;
fs/ext4/namei.c +0 -1
@@ -37,7 +37,6 @@#include "ext4.h" #include "ext4_jbd2.h" -#include "namei.h" #include "xattr.h" #include "acl.h"
fs/ext4/namei.h deleted +0 -6
@@ -1,8 +0,0 @@ -/* linux/fs/ext4/namei.h -* -* Copyright (C) 2005 Simtec Electronics -* Ben Dooks <[email protected]> -* -*/
Theodore Ts'o
maintainerPATCH 4/4 ext4: Move fs/ext4/group.h into ext4.h
Move the function prototypes in group.h into ext4.h so they are all defined in one place.
--- fs/ext4/balloc.c | 1 - fs/ext4/ext4.h | 17 +++++++++++++++++ fs/ext4/group.h | 29 ----------------------------- fs/ext4/ialloc.c | 1 - fs/ext4/resize.c | 1 - fs/ext4/super.c | 1 - 6 files changed, 17 insertions(+), 33 deletions(-) delete mode 100644 fs/ext4/group.h
fs/ext4/balloc.c +0 -1
@@ -19,7 +19,6 @@#include <linux/buffer_head.h> #include "ext4.h" #include "ext4_jbd2.h" -#include "group.h" #include "mballoc.h" /*
fs/ext4/ext4.h +17 -0
@@ -1271,6 +1271,14 @@ extern struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,ext4_group_t block_group, struct buffer_head ** bh);extern int ext4_should_retry_alloc (struct super_block *sb,int *retries); +struct buffer_head *ext4_read_block_bitmap (struct super_block *sb, +ext4_group_t block_group); +extern unsigned ext4_init_block_bitmap (struct super_block *sb, +struct buffer_head *bh, +ext4_group_t group, +struct ext4_group_desc *desc); +#define ext4_free_blocks_after_init (sb, group, desc) \ + ext4_init_block_bitmap(sb, NULL, group, desc)/* dir.c */ extern int ext4_check_dir_entry(const char *, struct inode *,
@@ -1295,6 +1303,11 @@ extern struct inode * ext4_orphan_get(struct super_block *, unsigned long);extern unsigned long ext4_count_free_inodes (struct super_block *);extern unsigned long ext4_count_dirs (struct super_block *);extern void ext4_check_inodes_bitmap (struct super_block *); +extern unsigned ext4_init_inode_bitmap (struct super_block *sb, +struct buffer_head *bh, +ext4_group_t group, +struct ext4_group_desc *desc); +extern void mark_bitmap_end (int start_bit,int end_bit,char *bitmap);/* mballoc.c */ extern long ext4_mb_stats;
@@ -1418,6 +1431,10 @@ extern void ext4_used_dirs_set(struct super_block *sb, struct ext4_group_desc *bg, __u32 count);extern void ext4_itable_unused_set (struct super_block *sb,struct ext4_group_desc *bg,__u32 count); +extern __le16 ext4_group_desc_csum (struct ext4_sb_info *sbi,__u32 group, +struct ext4_group_desc *gdp); +extern int ext4_group_desc_csum_verify (struct ext4_sb_info *sbi,__u32 group, +struct ext4_group_desc *gdp);static inline ext4_fsblk_t ext4_blocks_count (struct ext4_super_block *es) {
fs/ext4/group.h deleted +0 -29
@@ -1,29 +0,0 @@ -/* -* linux/fs/ext4/group.h -* -* Copyright (C) 2007 Cluster File Systems, Inc -* -* Author: Andreas Dilger <[email protected]> -*/ - -#ifndef _LINUX_EXT4_GROUP_H -#define _LINUX_EXT4_GROUP_H - -extern __le16 ext4_group_desc_csum (struct ext4_sb_info *sbi,__u32 group, -struct ext4_group_desc *gdp); -extern int ext4_group_desc_csum_verify (struct ext4_sb_info *sbi,__u32 group, -struct ext4_group_desc *gdp); -struct buffer_head *ext4_read_block_bitmap (struct super_block *sb, -ext4_group_t block_group); -extern unsigned ext4_init_block_bitmap (struct super_block *sb, -struct buffer_head *bh, -ext4_group_t group, -struct ext4_group_desc *desc); -#define ext4_free_blocks_after_init (sb, group, desc) \ - ext4_init_block_bitmap(sb, NULL, group, desc) -extern unsigned ext4_init_inode_bitmap (struct super_block *sb, -struct buffer_head *bh, -ext4_group_t group, -struct ext4_group_desc *desc); -extern void mark_bitmap_end (int start_bit,int end_bit,char *bitmap); -#endif /* _LINUX_EXT4_GROUP_H */
fs/ext4/ialloc.c +0 -1
@@ -27,7 +27,6 @@#include "ext4_jbd2.h" #include "xattr.h" #include "acl.h" -#include "group.h" /* * ialloc.c contains the inodes allocation and deallocation routines
fs/ext4/resize.c +0 -1
@@ -15,7 +15,6 @@#include <linux/slab.h> #include "ext4_jbd2.h" -#include "group.h" #define outside (b, first, last) ((b) < (first) || (b) >= (last))#define inside (b, first, last) ((b) >= (first) && (b) < (last))
fs/ext4/super.c +0 -1
@@ -46,7 +46,6 @@#include "ext4_jbd2.h" #include "xattr.h" #include "acl.h" -#include "group.h" struct proc_dir_entry *ext4_proc_root;static struct kset *ext4_kset;
Signature · 1 line
1.6.0.4