From 91b3aaf99177d63382e3bc4b9f66632fda2eca82 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Tue, 9 Sep 2014 13:39:08 -0500 Subject: [PATCH] staging/lustre: remove lvfs.h Move the definition of struct lvfs_run_ctxt to the one file that needed it (lustre/include/obd.h). Remove the then unneeded headers lustre/include/lvfs.h and lustre/include/linux/lvfs.h. Signed-off-by: John L. Hammond Signed-off-by: Greg Kroah-Hartman --- .../staging/lustre/lustre/include/cl_object.h | 2 +- .../lustre/lustre/include/linux/lvfs.h | 57 ------------------- drivers/staging/lustre/lustre/include/lvfs.h | 45 --------------- drivers/staging/lustre/lustre/include/obd.h | 4 ++ .../lustre/lustre/include/obd_support.h | 2 +- .../lustre/lustre/obdclass/obd_mount.c | 2 +- .../staging/lustre/lustre/ptlrpc/llog_net.c | 1 - 7 files changed, 7 insertions(+), 106 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/linux/lvfs.h delete mode 100644 drivers/staging/lustre/lustre/include/lvfs.h diff --git a/drivers/staging/lustre/lustre/include/cl_object.h b/drivers/staging/lustre/lustre/include/cl_object.h index 41858e43d732..d56c8bea89c4 100644 --- a/drivers/staging/lustre/lustre/include/cl_object.h +++ b/drivers/staging/lustre/lustre/include/cl_object.h @@ -98,7 +98,7 @@ * super-class definitions. */ #include "lu_object.h" -#include "lvfs.h" +#include "linux/lustre_compat25.h" #include #include diff --git a/drivers/staging/lustre/lustre/include/linux/lvfs.h b/drivers/staging/lustre/lustre/include/linux/lvfs.h deleted file mode 100644 index 786e779ed192..000000000000 --- a/drivers/staging/lustre/lustre/include/linux/lvfs.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. - * - * Copyright (c) 2012, Intel Corporation. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - * - * lustre/include/linux/lvfs.h - * - * lustre VFS/process permission interface - */ - -#ifndef __LINUX_LVFS_H__ -#define __LINUX_LVFS_H__ - -#ifndef __LVFS_H__ -#error Do not #include this file directly. #include instead -#endif - -#include -#include -#include -#include "lustre_compat25.h" - -struct lvfs_run_ctxt { - struct dt_device *dt; -}; - -#endif diff --git a/drivers/staging/lustre/lustre/include/lvfs.h b/drivers/staging/lustre/lustre/include/lvfs.h deleted file mode 100644 index a98307baa73d..000000000000 --- a/drivers/staging/lustre/lustre/include/lvfs.h +++ /dev/null @@ -1,45 +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) 2007, 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/lvfs.h - * - * lustre VFS/process permission interface - */ - -#ifndef __LVFS_H__ -#define __LVFS_H__ - -#include "../../include/linux/libcfs/libcfs.h" -#include "linux/lvfs.h" - -#endif diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h index daacd5d3c025..2a88b806fca5 100644 --- a/drivers/staging/lustre/lustre/include/obd.h +++ b/drivers/staging/lustre/lustre/include/obd.h @@ -800,6 +800,10 @@ struct obd_llog_group { #define OBD_DEVICE_MAGIC 0XAB5CD6EF #define OBD_DEV_BY_DEVNAME 0xffffd0de +struct lvfs_run_ctxt { + struct dt_device *dt; +}; + struct obd_device { struct obd_type *obd_type; __u32 obd_magic; diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h index e9497c1382bd..2991d2ee780b 100644 --- a/drivers/staging/lustre/lustre/include/obd_support.h +++ b/drivers/staging/lustre/lustre/include/obd_support.h @@ -39,7 +39,7 @@ #include #include "../../include/linux/libcfs/libcfs.h" -#include "lvfs.h" +#include "linux/lustre_compat25.h" #include "lprocfs_status.h" /* global variables */ diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c index 4e0635de4ba1..1260c8713bc6 100644 --- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c +++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c @@ -46,7 +46,7 @@ #define PRINT_CMD CDEBUG #include "../include/obd.h" -#include "../include/lvfs.h" +#include "../include/linux/lustre_compat25.h" #include "../include/obd_class.h" #include "../include/lustre/lustre_user.h" #include "../include/lustre_log.h" diff --git a/drivers/staging/lustre/lustre/ptlrpc/llog_net.c b/drivers/staging/lustre/lustre/ptlrpc/llog_net.c index 1d996cafe2a9..dac66f5b39da 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/llog_net.c +++ b/drivers/staging/lustre/lustre/ptlrpc/llog_net.c @@ -51,7 +51,6 @@ #include "../include/obd_class.h" #include "../include/lustre_log.h" #include -#include "../include/lvfs.h" int llog_initiator_connect(struct llog_ctxt *ctxt) {