On Sat 09-02-13 16:53:42, Ted Tso wrote: > This reverts commit 93737456d68ddcb86232f669b83da673dd12e351. > > The cow-snapshots effort is no longer active, so remove these extra > fields to shrink down the handle structure. Looks good. You can add: Reviewed-by: Jan Kara <jack@xxxxxxx> Honza > > Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx> > --- > include/linux/jbd2.h | 28 +++------------------------- > 1 file changed, 3 insertions(+), 25 deletions(-) > > diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h > index e0aafc4..24db725 100644 > --- a/include/linux/jbd2.h > +++ b/include/linux/jbd2.h > @@ -397,35 +397,13 @@ struct jbd2_journal_handle > int h_err; > > /* Flags [no locking] */ > - 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; > - > + 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 */ > > #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 > }; > > > -- > 1.7.12.rc0.22.gcdd159b > > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Jan Kara <jack@xxxxxxx> SUSE Labs, CR -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
