From: "John L. Hammond" <[email protected]> The definitions in lustre/include/linux/lvfs_linux.h are not used so remove that header.
Signed-off-by: John L. Hammond <[email protected]> --- drivers/staging/lustre/lustre/include/linux/lvfs.h | 4 +- .../lustre/lustre/include/linux/lvfs_linux.h | 59 -------------------- 2 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/linux/lvfs_linux.h diff --git a/drivers/staging/lustre/lustre/include/linux/lvfs.h b/drivers/staging/lustre/lustre/include/linux/lvfs.h index e4cdb45..ddeb7de 100644 --- a/drivers/staging/lustre/lustre/include/linux/lvfs.h +++ b/drivers/staging/lustre/lustre/include/linux/lvfs.h @@ -45,8 +45,10 @@ #error Do not #include this file directly. #include <lvfs.h> instead #endif +#include <linux/kernel.h> +#include <linux/fs.h> +#include <linux/sched.h> #include "lustre_compat25.h" -#include "lvfs_linux.h" #define LLOG_LVFS diff --git a/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h b/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h deleted file mode 100644 index 01e01ad..0000000 --- a/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h +++ /dev/null @@ -1,59 +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. - */ - -#ifndef __LVFS_LINUX_H__ -#define __LVFS_LINUX_H__ - -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/fs.h> -#include <linux/namei.h> -#include <linux/sched.h> - -#include "../lvfs.h" - -struct lvfs_run_ctxt; - -struct l_linux_dirent { - struct list_head lld_list; - ino_t lld_ino; - unsigned long lld_off; - char lld_name[LL_FID_NAMELEN]; -}; -struct l_readdir_callback { - struct l_linux_dirent *lrc_dirent; - struct list_head *lrc_list; -}; - -#endif /* __LVFS_LINUX_H__ */ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
