Merge tag 'for-linus-v3.11-rc1' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / fs / xfs / xfs_log.h

diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index 5caee96059dfb3a9fe5a1f03cd84c868674626b0..fb630e496c12406c558b7cc53854bf0cd123ccaf 100644 (file)
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -88,7 +88,8 @@ static inline xfs_lsn_t       _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2)
 #define XLOG_REG_TYPE_UNMOUNT          17
 #define XLOG_REG_TYPE_COMMIT           18
 #define XLOG_REG_TYPE_TRANSHDR         19
-#define XLOG_REG_TYPE_MAX              19
+#define XLOG_REG_TYPE_ICREATE          20
+#define XLOG_REG_TYPE_MAX              20
 
 typedef struct xfs_log_iovec {
        void            *i_addr;        /* beginning address of region */
@@ -105,6 +106,8 @@ struct xfs_log_vec {
        int                     lv_buf_len;     /* size of formatted buffer */
 };
 
+#define XFS_LOG_VEC_ORDERED    (-1)
+
 /*
  * Structure used to pass callback function and the function's argument
  * to the log manager.