openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John L. Hammond 2014-09-09 13:39:08 -05:00 committed by Greg Kroah-Hartman
parent 04b18c8d49
commit 91b3aaf991
7 changed files with 7 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/lustre/include/cl_object.h
View File

@ -98,7 +98,7 @@
* super-class definitions.
*/
#include "lu_object.h"
#include "lvfs.h"
#include "linux/lustre_compat25.h"
#include <linux/mutex.h>
#include <linux/radix-tree.h>

57
drivers/staging/lustre/lustre/include/linux/lvfs.h
View File

@ -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 <lvfs.h> instead
#endif
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/sched.h>
#include "lustre_compat25.h"
struct lvfs_run_ctxt {
struct dt_device *dt;
};
#endif

45
drivers/staging/lustre/lustre/include/lvfs.h
View File

@ -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

4
drivers/staging/lustre/lustre/include/obd.h
View File

@ -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;

2
drivers/staging/lustre/lustre/include/obd_support.h
View File

@ -39,7 +39,7 @@
#include <linux/slab.h>
#include "../../include/linux/libcfs/libcfs.h"
#include "lvfs.h"
#include "linux/lustre_compat25.h"
#include "lprocfs_status.h"
/* global variables */

2
drivers/staging/lustre/lustre/obdclass/obd_mount.c
View File

@ -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"

1
drivers/staging/lustre/lustre/ptlrpc/llog_net.c
View File

@ -51,7 +51,6 @@
#include "../include/obd_class.h"
#include "../include/lustre_log.h"
#include <linux/list.h>
#include "../include/lvfs.h"
int llog_initiator_connect(struct llog_ctxt *ctxt)
{