btrfs: use narrower type for btrfs_transaction::num_dirty_bgs

[sfrench/cifs-2.6.git] / fs / btrfs / transaction.h

diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index c55e44560103b48e2a917701899c611732d8a013..1805fd101767f5b23fea54258de9ff2ca2ae0149 100644 (file)
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -70,7 +70,7 @@ struct btrfs_transaction {
        struct list_head dirty_bgs;
        struct list_head io_bgs;
        struct list_head dropped_roots;
-       u64 num_dirty_bgs;
+       unsigned int num_dirty_bgs;
 
        /*
         * we need to make sure block group deletion doesn't race with
@@ -111,20 +111,19 @@ struct btrfs_trans_handle {
        u64 transid;
        u64 bytes_reserved;
        u64 chunk_bytes_reserved;
-       unsigned long use_count;
-       unsigned long blocks_reserved;
        unsigned long delayed_ref_updates;
        struct btrfs_transaction *transaction;
        struct btrfs_block_rsv *block_rsv;
        struct btrfs_block_rsv *orig_rsv;
+       refcount_t use_count;
+       unsigned int type;
        short aborted;
-       short adding_csums;
+       bool adding_csums;
        bool allocating_chunk;
        bool can_flush_pending_bgs;
        bool reloc_reserved;
        bool sync;
        bool dirty;
-       unsigned int type;
        struct btrfs_root *root;
        struct btrfs_fs_info *fs_info;
        struct list_head new_bgs;