diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-03-13 19:14:43 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-03-13 19:14:43 +1100 |
| commit | fe986f9d88ab8079c91669b7f175081f15491a80 (patch) | |
| tree | 73be54e2c5378750dee0ebc0720af5143d2c4dc6 /fs/xfs/xfs_trans_resv.h | |
| parent | 5f44e4c185ec5a4a438841cbd4983d0c4a106a4a (diff) | |
| parent | ab29743117f9f4c22ac44c13c1647fb24fb2bafe (diff) | |
Merge branch 'xfs-O_TMPFILE-support' into for-next
Conflicts:
fs/xfs/xfs_trans_resv.c
- fix for XFS_INODE_CLUSTER_SIZE macro removal
Diffstat (limited to 'fs/xfs/xfs_trans_resv.h')
| -rw-r--r-- | fs/xfs/xfs_trans_resv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/xfs_trans_resv.h b/fs/xfs/xfs_trans_resv.h index f76c1297b83f..1097d14cd583 100644 --- a/fs/xfs/xfs_trans_resv.h +++ b/fs/xfs/xfs_trans_resv.h @@ -38,6 +38,7 @@ struct xfs_trans_resv { struct xfs_trans_res tr_remove; /* unlink trans */ struct xfs_trans_res tr_symlink; /* symlink trans */ struct xfs_trans_res tr_create; /* create trans */ + struct xfs_trans_res tr_create_tmpfile; /* create O_TMPFILE trans */ struct xfs_trans_res tr_mkdir; /* mkdir trans */ struct xfs_trans_res tr_ifree; /* inode free trans */ struct xfs_trans_res tr_ichange; /* inode update trans */ @@ -99,6 +100,7 @@ struct xfs_trans_resv { #define XFS_ITRUNCATE_LOG_COUNT 2 #define XFS_INACTIVE_LOG_COUNT 2 #define XFS_CREATE_LOG_COUNT 2 +#define XFS_CREATE_TMPFILE_LOG_COUNT 2 #define XFS_MKDIR_LOG_COUNT 3 #define XFS_SYMLINK_LOG_COUNT 3 #define XFS_REMOVE_LOG_COUNT 2 |