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-mem-types.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-mem-types.h')
-rw-r--r-- | xlators/features/changelog/src/changelog-mem-types.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xlators/features/changelog/src/changelog-mem-types.h b/xlators/features/changelog/src/changelog-mem-types.h index a65bbb4f2..d72464eab 100644 --- a/xlators/features/changelog/src/changelog-mem-types.h +++ b/xlators/features/changelog/src/changelog-mem-types.h @@ -19,11 +19,10 @@ enum gf_changelog_mem_types { gf_changelog_mt_batch_t = gf_common_mt_end + 3, gf_changelog_mt_rt_t = gf_common_mt_end + 4, gf_changelog_mt_inode_ctx_t = gf_common_mt_end + 5, - gf_changelog_mt_fop_policy_t = gf_common_mt_end + 6, - gf_changelog_mt_libgfchangelog_t = gf_common_mt_end + 7, - gf_changelog_mt_libgfchangelog_rl_t = gf_common_mt_end + 8, - gf_changelog_mt_libgfchangelog_dirent_t = gf_common_mt_end + 9, - gf_changelog_mt_changelog_buffer_t = gf_common_mt_end + 10, + gf_changelog_mt_libgfchangelog_t = gf_common_mt_end + 6, + gf_changelog_mt_libgfchangelog_rl_t = gf_common_mt_end + 7, + gf_changelog_mt_libgfchangelog_dirent_t = gf_common_mt_end + 8, + gf_changelog_mt_changelog_buffer_t = gf_common_mt_end + 9, gf_changelog_mt_end }; |