Merging upstream version 1.46.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 96 deletions

diff --git a/fluent-bit/plugins/in_tail/tail_fs.h b/fluent-bit/plugins/in_tail/tail_fs.h
deleted file mode 100644
index 948954333..000000000
--- a/fluent-bit/plugins/in_tail/tail_fs.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
-/*  Fluent Bit
- *  ==========
- *  Copyright (C) 2015-2022 The Fluent Bit Authors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#ifndef FLB_TAIL_FS_H
-#define FLB_TAIL_FS_H
-
-#include <fluent-bit/flb_info.h>
-#include <fluent-bit/flb_input.h>
-
-#include "tail_config.h"
-#include "tail_file_internal.h"
-
-#include "tail_fs_stat.h"
-#ifdef FLB_HAVE_INOTIFY
-#include "tail_fs_inotify.h"
-#endif
-
-static inline int flb_tail_fs_init(struct flb_input_instance *in,
-                     struct flb_tail_config *ctx, struct flb_config *config)
-{
-#ifdef FLB_HAVE_INOTIFY
-    if (ctx->inotify_watcher) {
-        return flb_tail_fs_inotify_init(in, ctx, config);
-    }
-#endif
-    return flb_tail_fs_stat_init(in, ctx, config);
-}
-
-static inline void flb_tail_fs_pause(struct flb_tail_config *ctx)
-{
-#ifdef FLB_HAVE_INOTIFY
-    if (ctx->inotify_watcher) {
-        return flb_tail_fs_inotify_pause(ctx);
-    }
-#endif
-    return flb_tail_fs_stat_pause(ctx);
-}
-
-static inline void flb_tail_fs_resume(struct flb_tail_config *ctx)
-{
-#ifdef FLB_HAVE_INOTIFY
-    if (ctx->inotify_watcher) {
-        return flb_tail_fs_inotify_resume(ctx);
-    }
-#endif
-    return flb_tail_fs_stat_resume(ctx);
-}
-
-static inline int flb_tail_fs_add(struct flb_tail_config *ctx, struct flb_tail_file *file)
-{
-#ifdef FLB_HAVE_INOTIFY
-    if (ctx->inotify_watcher) {
-        return flb_tail_fs_inotify_add(file);
-    }
-#endif
-    return flb_tail_fs_stat_add(file);
-}
-
-static inline int flb_tail_fs_remove(struct flb_tail_config *ctx, struct flb_tail_file *file)
-{
-#ifdef FLB_HAVE_INOTIFY
-    if (ctx->inotify_watcher) {
-        return flb_tail_fs_inotify_remove(file);
-    }
-#endif
-    return flb_tail_fs_stat_remove(file);
-}
-
-static inline int flb_tail_fs_exit(struct flb_tail_config *ctx)
-{
-#ifdef FLB_HAVE_INOTIFY
-    if (ctx->inotify_watcher) {
-        return flb_tail_fs_inotify_exit(ctx);
-    }
-#endif
-    return flb_tail_fs_stat_exit(ctx);
-}
-
-
-#endif