diff options
author | Dave Chinner <david@fromorbit.com> | 2014-05-14 19:36:35 -0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-05-14 19:36:35 -0400 |
commit | fdd3a2ae2e48310491e605c46201c95629dd450b (patch) | |
tree | 2a9361017d5fad1b39e77b8bb5eb1fd45cea0597 /fs/xfs/xfs_inode.c | |
parent | ee4eec478be4677b93775d17bc079efb5922b276 (diff) | |
parent | 5e06d148949bb79af429c46afb4b81bc31308f6e (diff) |
Merge branch 'xfs-unused-args-cleanup' into for-next
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r-- | fs/xfs/xfs_inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 768087bedbac..4e3b7ad7ac8f 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -3372,9 +3372,9 @@ xfs_iflush_int( | |||
3372 | } | 3372 | } |
3373 | } | 3373 | } |
3374 | 3374 | ||
3375 | xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK, bp); | 3375 | xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK); |
3376 | if (XFS_IFORK_Q(ip)) | 3376 | if (XFS_IFORK_Q(ip)) |
3377 | xfs_iflush_fork(ip, dip, iip, XFS_ATTR_FORK, bp); | 3377 | xfs_iflush_fork(ip, dip, iip, XFS_ATTR_FORK); |
3378 | xfs_inobp_check(mp, bp); | 3378 | xfs_inobp_check(mp, bp); |
3379 | 3379 | ||
3380 | /* | 3380 | /* |