Merge ath-current from ath.git

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

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 7176cc0fe43f7074ffa3c959bb3a7eae0d3b90e2..23c96059cef26a6292847a051b893f254cc472b3 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -73,6 +73,8 @@ struct btrfs_ordered_sum {
 
 #define BTRFS_ORDERED_LOGGED 10 /* Set when we've waited on this ordered extent
                                 * in the logging code. */
+#define BTRFS_ORDERED_PENDING 11 /* We are waiting for this ordered extent to
+                                 * complete in the current transaction. */
 struct btrfs_ordered_extent {
        /* logical offset in the file */
        u64 file_offset;