diff options
author | Jeff Darcy <jdarcy@redhat.com> | 2014-01-14 16:59:00 +0000 |
---|---|---|
committer | Jeff Darcy <jdarcy@redhat.com> | 2014-01-14 16:59:00 +0000 |
commit | 92eaa72ea4cd0d06c2161842c548008db0eee01c (patch) | |
tree | 441658ad7f69a2a3deb404e43a7ff8e2d50e101a /xlators/features/changelog/src/changelog-rt.h | |
parent | e0cce4cf7c22d5cd8ab6c2aff4ecf28c18c6a469 (diff) |
Temporarily revert NSR-specific changelog patches.
This is necessary so that patches from upstream can merge cleanly.
Otherwise there are some nasty conflicts, and resolving them by
hand gets even uglier than this approach.
Change-Id: I4235f8ba0ad63563c2e7dec1a1e8eeb636657574
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/features/changelog/src/changelog-rt.h')
-rw-r--r-- | xlators/features/changelog/src/changelog-rt.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xlators/features/changelog/src/changelog-rt.h b/xlators/features/changelog/src/changelog-rt.h index 09398041d..1fc2bbc5b 100644 --- a/xlators/features/changelog/src/changelog-rt.h +++ b/xlators/features/changelog/src/changelog-rt.h @@ -27,8 +27,7 @@ changelog_rt_init (xlator_t *this, changelog_dispatcher_t *cd); int changelog_rt_fini (xlator_t *this, changelog_dispatcher_t *cd); int -changelog_rt_enqueue (xlator_t *this, - changelog_priv_t *priv, void *cbatch, - changelog_local_t *local, changelog_log_data_t *cld_0); +changelog_rt_enqueue (xlator_t *this, changelog_priv_t *priv, void *cbatch, + changelog_log_data_t *cld_0, changelog_log_data_t *cld_1); #endif /* _CHANGELOG_RT_H */ |