diff options
| author |   Dave Chinner <david@fromorbit.com> | 2014-02-20 15:16:09 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-02-20 15:16:09 +1100 |
| commit | b678573e29749e7fe884c3a8e61c1cf1e1093987 (patch) | |
| tree | 32b02db96ee1f20d98f414e91325afa8d08ebd9c /fs/xfs/xfs_log_cil.c | |
| parent | xfs: limit superblock corruption errors to actual corruption (diff) | |
| parent | xfs: remove XFS_TRANS_DEBUG dead code (diff) | |
| download | linux-dev-b678573e29749e7fe884c3a8e61c1cf1e1093987.tar.xz linux-dev-b678573e29749e7fe884c3a8e61c1cf1e1093987.zip | |
Merge branch 'xfs-fixes-for-3.15' into for-next
Diffstat (limited to 'fs/xfs/xfs_log_cil.c')
| -rw-r--r-- | fs/xfs/xfs_log_cil.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c index 4ef6fdbced78..b57a8e08b3d1 100644 --- a/fs/xfs/xfs_log_cil.c +++ b/fs/xfs/xfs_log_cil.c @@ -721,7 +721,7 @@ xlog_cil_empty( * background commit, returns without it held once background commits are * allowed again. */ -int +void xfs_log_commit_cil( struct xfs_mount *mp, struct xfs_trans *tp, @@ -767,7 +767,6 @@ xfs_log_commit_cil( xlog_cil_push_background(log); up_read(&cil->xc_ctx_lock); - return 0; } /* |