Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

This reverts commit 93737456d68ddcb86232f669b83da673dd12e351.

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

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>

+3 -25
+3 -25
include/linux/jbd2.h
··· 397 397 int h_err; 398 398 399 399 /* Flags [no locking] */ 400 - unsigned int h_sync:1; /* sync-on-close */ 401 - unsigned int h_jdata:1; /* force data journaling */ 402 - unsigned int h_aborted:1; /* fatal error on handle */ 403 - unsigned int h_cowing:1; /* COWing block to snapshot */ 404 - 405 - /* Number of buffers requested by user: 406 - * (before adding the COW credits factor) */ 407 - unsigned int h_base_credits:14; 408 - 409 - /* Number of buffers the user is allowed to dirty: 410 - * (counts only buffers dirtied when !h_cowing) */ 411 - unsigned int h_user_credits:14; 412 - 400 + unsigned int h_sync: 1; /* sync-on-close */ 401 + unsigned int h_jdata: 1; /* force data journaling */ 402 + unsigned int h_aborted: 1; /* fatal error on handle */ 413 403 414 404 #ifdef CONFIG_DEBUG_LOCK_ALLOC 415 405 struct lockdep_map h_lockdep_map; 416 - #endif 417 - 418 - #ifdef CONFIG_JBD2_DEBUG 419 - /* COW debugging counters: */ 420 - unsigned int h_cow_moved; /* blocks moved to snapshot */ 421 - unsigned int h_cow_copied; /* blocks copied to snapshot */ 422 - unsigned int h_cow_ok_jh; /* blocks already COWed during current 423 - transaction */ 424 - unsigned int h_cow_ok_bitmap; /* blocks not set in COW bitmap */ 425 - unsigned int h_cow_ok_mapped;/* blocks already mapped in snapshot */ 426 - unsigned int h_cow_bitmaps; /* COW bitmaps created */ 427 - unsigned int h_cow_excluded; /* blocks set in exclude bitmap */ 428 406 #endif 429 407 }; 430 408