summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_log_cil.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-02-20 08:16:09 +0400
committerDave Chinner <david@fromorbit.com>2014-02-20 08:16:09 +0400
commitb678573e29749e7fe884c3a8e61c1cf1e1093987 (patch)
tree32b02db96ee1f20d98f414e91325afa8d08ebd9c /fs/xfs/xfs_log_cil.c
parent5ef11eb0700f806c4671ba33e5befa784a2f70ef (diff)
parent492185ef1dd261768203a6c3accfd445cde8c503 (diff)
downloadlinux-b678573e29749e7fe884c3a8e61c1cf1e1093987.tar.xz
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.c3
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;
}
/*