diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:48:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:48:58 +0200 |
| commit | c69f203df3e61414fbf1a66d130abfd7c3bf3fd0 (patch) | |
| tree | a6850417a1871f7bf321ef0318bd8c43439d7fed /fs/xfs/libxfs/xfs_inode_fork.h | |
| parent | 3906a13a6b4e78fbc0def03a808f091f0dff1b44 (diff) | |
| parent | fe82203b63e598c34d96e846dea49679a726fc7a (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/xfs/libxfs/xfs_inode_fork.h')
| -rw-r--r-- | fs/xfs/libxfs/xfs_inode_fork.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h index 7fb8365326d1..132dc59fdde6 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.h +++ b/fs/xfs/libxfs/xfs_inode_fork.h @@ -140,7 +140,7 @@ typedef struct xfs_ifork { struct xfs_ifork *xfs_iext_state_to_fork(struct xfs_inode *ip, int state); int xfs_iformat_fork(struct xfs_inode *, struct xfs_dinode *); -void xfs_iflush_fork(struct xfs_inode *, struct xfs_dinode *, +int xfs_iflush_fork(struct xfs_inode *, struct xfs_dinode *, struct xfs_inode_log_item *, int); void xfs_idestroy_fork(struct xfs_inode *, int); void xfs_idata_realloc(struct xfs_inode *, int, int); |