Merge branch 'xfs-O_TMPFILE-support' into for-next
Conflicts: fs/xfs/xfs_trans_resv.c - fix for XFS_INODE_CLUSTER_SIZE macro removal
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user