Skip to content

Commit

Permalink
ext4: Remove stale block allocator references from ext4.h
Browse files Browse the repository at this point in the history
Remove some leftovers from when the old block allocator was removed
(c2ea3fd).  ext4_sb_info is now a bit lighter.  Also remove a dangling
read_block_bitmap() prototype.

Signed-off-by: Mike Snitzer <snitzer@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  • Loading branch information
Mike Snitzer authored and Theodore Ts'o committed Feb 6, 2009
1 parent 0d34fb8 commit 074ca44
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 18 deletions.
10 changes: 0 additions & 10 deletions fs/ext4/ext4.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@
*/
#undef EXT4FS_DEBUG

/*
* Define EXT4_RESERVATION to reserve data blocks for expanding files
*/
#define EXT4_DEFAULT_RESERVE_BLOCKS 8
/*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */
#define EXT4_MAX_RESERVE_BLOCKS 1027
#define EXT4_RESERVE_WINDOW_NOT_ALLOCATED 0

/*
* Debug code
*/
Expand All @@ -54,8 +46,6 @@
#define ext4_debug(f, a...) do {} while (0)
#endif

#define EXT4_MULTIBLOCK_ALLOCATOR 1

/* prefer goal again. length */
#define EXT4_MB_HINT_MERGE 1
/* blocks already reserved */
Expand Down
3 changes: 0 additions & 3 deletions fs/ext4/ext4_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ typedef __u32 ext4_lblk_t;
/* data type for block group number */
typedef unsigned int ext4_group_t;

#define rsv_start rsv_window._rsv_start
#define rsv_end rsv_window._rsv_end

/*
* storage for cached extent
*/
Expand Down
4 changes: 0 additions & 4 deletions fs/ext4/ext4_sb.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ struct ext4_sb_info {
struct blockgroup_lock s_blockgroup_lock;
struct proc_dir_entry *s_proc;

/* root of the per fs reservation window tree */
spinlock_t s_rsv_window_lock;
struct rb_root s_rsv_window_root;

/* Journaling */
struct inode *s_journal_inode;
struct journal_s *s_journal;
Expand Down
1 change: 0 additions & 1 deletion fs/ext4/mballoc.h
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ static inline void ext4_mb_store_history(struct ext4_allocation_context *ac)

#define in_range(b, first, len) ((b) >= (first) && (b) <= (first) + (len) - 1)

struct buffer_head *read_block_bitmap(struct super_block *, ext4_group_t);
static inline ext4_fsblk_t ext4_grp_offs_to_block(struct super_block *sb,
struct ext4_free_extent *fex)
{
Expand Down

0 comments on commit 074ca44

Please sign in to comment.