Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 074ca442 authored by Mike Snitzer's avatar Mike Snitzer Committed by Theodore Ts'o
Browse files

ext4: Remove stale block allocator references from ext4.h 



Remove some leftovers from when the old block allocator was removed
(c2ea3fde).  ext4_sb_info is now a bit lighter.  Also remove a dangling
read_block_bitmap() prototype.

Signed-off-by: default avatarMike Snitzer <snitzer@gmail.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 0d34fb8e

fs/ext4/ext4.h

+0 −10
Original line number Diff line number Diff line
@@ -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

 */
@@ -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 */

fs/ext4/ext4_i.h

+0 −3
Original line number Diff line number Diff line
@@ -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

 */

fs/ext4/ext4_sb.h

+0 −4
Original line number Diff line number Diff line
@@ -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;

fs/ext4/mballoc.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

{