From eed766c163bc3752e6bec97eb405a51a996af14d Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Thu, 28 Aug 2014 18:35:15 -0500 Subject: [PATCH] staging/lustre: remove linux/lustre_log.h Remove the superfluous header lustre/include/linux/lustre_log.h. Signed-off-by: John L. Hammond Signed-off-by: Greg Kroah-Hartman --- .../lustre/lustre/include/linux/lustre_log.h | 57 ------------------- .../lustre/lustre/include/lustre_log.h | 2 - 2 files changed, 59 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_log.h diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_log.h b/drivers/staging/lustre/lustre/include/linux/lustre_log.h deleted file mode 100644 index e9c8e56737d2..000000000000 --- a/drivers/staging/lustre/lustre/include/linux/lustre_log.h +++ /dev/null @@ -1,57 +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) 2003, 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. - * - * lustre/include/linux/lustre_log.h - * - * Generic infrastructure for managing a collection of logs. - * These logs are used for: - * - orphan recovery: OST adds record on create - * - mtime/size consistency: the OST adds a record on first write - * - open/unlinked objects: OST adds a record on destroy - * - * - mds unlink log: the MDS adds an entry upon delete - * - * - raid1 replication log between OST's - * - MDS replication logs - */ - -#ifndef _LINUX_LUSTRE_LOG_H -#define _LINUX_LUSTRE_LOG_H - -#ifndef _LUSTRE_LOG_H -#error Do not #include this file directly. #include instead -#endif - -#define LUSTRE_LOG_SERVER - -#endif diff --git a/drivers/staging/lustre/lustre/include/lustre_log.h b/drivers/staging/lustre/lustre/include/lustre_log.h index c2ab294aef5e..3944c6d91fbc 100644 --- a/drivers/staging/lustre/lustre/include/lustre_log.h +++ b/drivers/staging/lustre/lustre/include/lustre_log.h @@ -56,8 +56,6 @@ * @{ */ -#include "linux/lustre_log.h" - #include "obd_class.h" #include "obd_ost.h" #include "lustre/lustre_idl.h" -- 2.34.1