Commit 078d5039 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

jbd2: revert "jbd2: add COW fields to struct jbd2_journal_handle" 



This reverts commit 93737456.

The cow-snapshots effort is no longer active, so remove these extra
fields to shrink down the handle structure.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 9fff24aa

include/linux/jbd2.h

+3 −25
Original line number Diff line number Diff line
@@ -400,32 +400,10 @@ struct jbd2_journal_handle 
	unsigned int	h_sync:		1;	/* sync-on-close */

	unsigned int	h_jdata:	1;	/* force data journaling */

	unsigned int	h_aborted:	1;	/* fatal error on handle */

	unsigned int	h_cowing:1;	/* COWing block to snapshot */



	/* Number of buffers requested by user:

	 * (before adding the COW credits factor) */

	unsigned int	h_base_credits:14;



	/* Number of buffers the user is allowed to dirty:

	 * (counts only buffers dirtied when !h_cowing) */

	unsigned int	h_user_credits:14;





#ifdef CONFIG_DEBUG_LOCK_ALLOC

	struct lockdep_map	h_lockdep_map;

#endif



#ifdef CONFIG_JBD2_DEBUG

	/* COW debugging counters: */

	unsigned int h_cow_moved; /* blocks moved to snapshot */

	unsigned int h_cow_copied; /* blocks copied to snapshot */

	unsigned int h_cow_ok_jh; /* blocks already COWed during current

				     transaction */

	unsigned int h_cow_ok_bitmap; /* blocks not set in COW bitmap */

	unsigned int h_cow_ok_mapped;/* blocks already mapped in snapshot */

	unsigned int h_cow_bitmaps; /* COW bitmaps created */

	unsigned int h_cow_excluded; /* blocks set in exclude bitmap */

#endif

};