From: John L. Hammond Date: Tue, 7 Oct 2014 01:11:33 +0000 (-0400) Subject: LU-2675 libcfs: remove {linux,posix}-tracefile.h X-Git-Tag: 2.6.54~9 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=9ed879b12c07d1f4de2fe55f35318ed8cdd8995c LU-2675 libcfs: remove {linux,posix}-tracefile.h Move the definition of the trace buffer type enum in libcfs/libcfs/tracefile.h. Remove the then unneeded headers libcfs/libcfs/linux/linux-tracefile.h and libcfs/libcfs/posix/posix-tracefile.h. Signed-off-by: John L. Hammond Change-Id: Ied6fe04e98ba4d91197956ecf6566f73eabb7114 Reviewed-on: http://review.whamcloud.com/11983 Tested-by: Jenkins Reviewed-by: Bob Glossman Reviewed-by: James Simmons Reviewed-by: Dmitry Eremin Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index 90bb1c1..8b088ba 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -449,7 +449,6 @@ libcfs/include/libcfs/util/Makefile libcfs/libcfs/Makefile libcfs/libcfs/autoMakefile libcfs/libcfs/linux/Makefile -libcfs/libcfs/posix/Makefile libcfs/libcfs/util/Makefile ]) ]) # LIBCFS_CONFIG_FILES diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am index e1363a5..2ecd6c0 100644 --- a/libcfs/libcfs/autoMakefile.am +++ b/libcfs/libcfs/autoMakefile.am @@ -36,8 +36,8 @@ # Lustre is a trademark of Sun Microsystems, Inc. # -SUBDIRS = linux util posix -DIST_SUBDIRS = linux util posix +SUBDIRS = linux util +DIST_SUBDIRS = linux util noinst_LIBRARIES= libcfs.a libcfs_a_SOURCES = user-string.c @@ -65,4 +65,4 @@ MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o libcfs EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h prng.c \ workitem.c \ kernel_user_comm.c fail.c libcfs_cpu.c heap.c \ - libcfs_mem.c libcfs_lock.c user-string.c linux/linux-tracefile.h + libcfs_mem.c libcfs_lock.c user-string.c diff --git a/libcfs/libcfs/linux/linux-tracefile.h b/libcfs/libcfs/linux/linux-tracefile.h deleted file mode 100644 index ba84e4f..0000000 --- a/libcfs/libcfs/linux/linux-tracefile.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#ifndef __LIBCFS_LINUX_TRACEFILE_H__ -#define __LIBCFS_LINUX_TRACEFILE_H__ - -/** - * three types of trace_data in linux - */ -typedef enum { - CFS_TCD_TYPE_PROC = 0, - CFS_TCD_TYPE_SOFTIRQ, - CFS_TCD_TYPE_IRQ, - CFS_TCD_TYPE_MAX -} cfs_trace_buf_type_t; - -#endif diff --git a/libcfs/libcfs/posix/.gitignore b/libcfs/libcfs/posix/.gitignore deleted file mode 100644 index 10a7e8d..0000000 --- a/libcfs/libcfs/posix/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Makefile.in diff --git a/libcfs/libcfs/posix/Makefile.am b/libcfs/libcfs/posix/Makefile.am deleted file mode 100644 index 0788a75..0000000 --- a/libcfs/libcfs/posix/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = posix-tracefile.h - - diff --git a/libcfs/libcfs/posix/posix-tracefile.h b/libcfs/libcfs/posix/posix-tracefile.h deleted file mode 100644 index 020c494..0000000 --- a/libcfs/libcfs/posix/posix-tracefile.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.gnu.org/licenses/gpl-2.0.htm - * - * GPL HEADER END - */ -/* - * libcfs/libcfs/posix/posix-tracefile.h - * - * Userspace debugging-tracing - */ - -#ifndef __LIBCFS_POSIX_TRACEFILE_H__ -#define __LIBCFS_POSIX_TRACEFILE_H__ - -/** - * three types of trace_data in linux - * posix need to max of available types to have - * type checking happy. - */ -typedef enum { - CFS_TCD_TYPE_PROC = 0, - CFS_TCD_TYPE_SOFTIRQ, - CFS_TCD_TYPE_IRQ, - CFS_TCD_TYPE_MAX -} cfs_trace_buf_type_t; - -#endif diff --git a/libcfs/libcfs/tracefile.h b/libcfs/libcfs/tracefile.h index 6eed697..1291c58 100644 --- a/libcfs/libcfs/tracefile.h +++ b/libcfs/libcfs/tracefile.h @@ -39,11 +39,13 @@ #include -#ifdef __KERNEL__ -# include "linux/linux-tracefile.h" -#else /* __KERNEL__ */ -# include "posix/posix-tracefile.h" -#endif /* !__KERNEL__ */ +typedef enum { + CFS_TCD_TYPE_PROC = 0, + CFS_TCD_TYPE_SOFTIRQ, + CFS_TCD_TYPE_IRQ, + CFS_TCD_TYPE_MAX +} cfs_trace_buf_type_t; + /* trace file lock routines */ #define TRACEFILE_NAME_SIZE 1024 @@ -258,13 +260,6 @@ extern void cfs_print_to_console(struct ptldebug_header *hdr, int mask, extern int cfs_trace_lock_tcd(struct cfs_trace_cpu_data *tcd, int walking); extern void cfs_trace_unlock_tcd(struct cfs_trace_cpu_data *tcd, int walking); -/** - * trace_buf_type_t, trace_buf_idx_get() and trace_console_buffers[][] - * are not public libcfs API; they should be defined in - * platform-specific tracefile include files - * (see, for example, linux-tracefile.h). - */ - extern char *cfs_trace_console_buffers[NR_CPUS][CFS_TCD_TYPE_MAX]; extern cfs_trace_buf_type_t cfs_trace_buf_idx_get(void);