Merge tag 'stable/for-linus-3.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / fs / btrfs / btrfs_inode.h

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 8fed2125689ed39b928800e78cfbf3b720d52a24..c9a24444ec9a317483c4486fb132b6893f57a19d 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -109,14 +109,17 @@ struct btrfs_inode {
        u64 last_trans;
 
        /*
-        * log transid when this inode was last modified
+        * transid that last logged this inode
         */
-       u64 last_sub_trans;
+       u64 logged_trans;
 
        /*
-        * transid that last logged this inode
+        * log transid when this inode was last modified
         */
-       u64 logged_trans;
+       int last_sub_trans;
+
+       /* a local copy of root's last_log_commit */
+       int last_log_commit;
 
        /* total number of bytes pending delalloc, used by stat to calc the
         * real block usage of the file
@@ -155,9 +158,6 @@ struct btrfs_inode {
        /* flags field from the on disk inode */
        u32 flags;
 
-       /* a local copy of root's last_log_commit */
-       unsigned long last_log_commit;
-
        /*
         * Counters to keep track of the number of extent item's we may use due
         * to delalloc and such.  outstanding_extents is the number of extent