From 05b6528d2dc6f0b6b7647a2a3fd05bedd8b30f29 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Mon, 18 Aug 2014 10:48:47 -0500 Subject: [PATCH] LU-2675 lustre: remove linux/lprocfs_status.h Remove lustre/include/linux/lprocfs_status.h. Include linux/statfs.h where needed. Signed-off-by: John L. Hammond Change-Id: I4f5965fee6b82187a0f5f548843a2643b1438bc1 Reviewed-on: http://review.whamcloud.com/11489 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Emoly Liu Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- lustre/include/linux/Makefile.am | 2 +- lustre/include/linux/lprocfs_status.h | 62 ----------------------------------- lustre/include/lprocfs_status.h | 1 - lustre/include/lustre_lib.h | 1 + lustre/llite/llite_lib.c | 1 + lustre/obdclass/obd_mount_server.c | 1 + lustre/obdclass/statfs_pack.c | 2 +- lustre/osd-ldiskfs/osd_internal.h | 2 +- 8 files changed, 6 insertions(+), 66 deletions(-) delete mode 100644 lustre/include/linux/lprocfs_status.h diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am index e1bd8c6..401eef4 100644 --- a/lustre/include/linux/Makefile.am +++ b/lustre/include/linux/Makefile.am @@ -42,7 +42,7 @@ if UTILS linux_HEADERS = lustre_user.h endif -EXTRA_DIST = lprocfs_status.h lustre_acl.h lustre_debug.h lustre_lib.h \ +EXTRA_DIST = lustre_acl.h lustre_debug.h lustre_lib.h \ lustre_dlm.h lustre_handles.h lustre_net.h obd_class.h obd_support.h \ obd.h lvfs.h lustre_log.h lustre_compat25.h lustre_lite.h lustre_quota.h \ lustre_user.h lustre_patchless_compat.h lustre_intent.h lustre_common.h diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h deleted file mode 100644 index ac2e7fc..0000000 --- a/lustre/include/linux/lprocfs_status.h +++ /dev/null @@ -1,62 +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) 2002, 2010, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - * - * Copyright (c) 2011, Intel Corporation. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - * - * lustre/include/linux/lprocfs_status.h - * - * Top level header file for LProc SNMP - * - * Author: Hariharan Thantry thantry@users.sourceforge.net - */ -#ifndef _LINUX_LPROCFS_SNMP_H -#define _LINUX_LPROCFS_SNMP_H - -#ifndef _LPROCFS_SNMP_H -#error Do not #include this file directly. #include instead -#endif - -#ifdef __KERNEL__ -#include -#include -#include -#include -#include -#include -#include - -#else -#define kstatfs statfs -#endif - -#endif /* LPROCFS_SNMP_H */ diff --git a/lustre/include/lprocfs_status.h b/lustre/include/lprocfs_status.h index de920dc..98e3868 100644 --- a/lustre/include/lprocfs_status.h +++ b/lustre/include/lprocfs_status.h @@ -42,7 +42,6 @@ #ifndef _LPROCFS_SNMP_H #define _LPROCFS_SNMP_H -#include #include #include diff --git a/lustre/include/lustre_lib.h b/lustre/include/lustre_lib.h index d9c2816..e1a4c2a 100644 --- a/lustre/include/lustre_lib.h +++ b/lustre/include/lustre_lib.h @@ -53,6 +53,7 @@ #include /* target.c */ +struct kstatfs; struct ptlrpc_request; struct obd_export; struct lu_target; diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 135e77f..7407f42 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -41,6 +41,7 @@ #define DEBUG_SUBSYSTEM S_LLITE #include +#include #include #include #include diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c index f0b169e..2459473 100644 --- a/lustre/obdclass/obd_mount_server.c +++ b/lustre/obdclass/obd_mount_server.c @@ -46,6 +46,7 @@ #define PRINT_CMD CDEBUG #define PRINT_MASK (D_SUPER | D_CONFIG) +#include #include #include #include diff --git a/lustre/obdclass/statfs_pack.c b/lustre/obdclass/statfs_pack.c index ba9c649..2e7f41c 100644 --- a/lustre/obdclass/statfs_pack.c +++ b/lustre/obdclass/statfs_pack.c @@ -40,7 +40,7 @@ #define DEBUG_SUBSYSTEM S_CLASS - +#include #include #include #include diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h index b3f15b5..39e54e6 100644 --- a/lustre/osd-ldiskfs/osd_internal.h +++ b/lustre/osd-ldiskfs/osd_internal.h @@ -52,7 +52,7 @@ #include /* struct dirent64 */ #include - +#include #include #include -- 1.8.3.1